diff --git a/Documentation/Developers/REGISTER b/Documentation/Developers/REGISTER
index baa714489..afa0f5d22 100644
--- a/Documentation/Developers/REGISTER
+++ b/Documentation/Developers/REGISTER
@@ -124,7 +124,8 @@ Licence Names (for package description):
   FDL			The GNU Free Documentation License
   MPL			The Mozilla Public Licence
   MIT			The MIT License
-  BSD			The BSD	Licence 
+  BSD			The BSD	Licence
+  DLJ			The Operating System Distributor's License for Java
 
   OpenSource		Any other Open Source licence
   Free-to-use		Any other non Open Source (but free to use) licence
diff --git a/package/java/sun-jdk15/sun-jdk15.conf b/package/java/sun-jdk15/sun-jdk15.conf
index 2b6e1398b..2cf234c11 100644
--- a/package/java/sun-jdk15/sun-jdk15.conf
+++ b/package/java/sun-jdk15/sun-jdk15.conf
@@ -22,10 +22,14 @@
 
 install_jdk ()
 {
-	cp -a $archdir/jdk-${ver//./_}-linux-i586.bin java.bin
+	if [[ "$xpkg" == *-amd64 ]] ; then
+		cp -a $archdir/jdk-${ver//./_}-distro-linux-amd64.bin java.bin
+	else
+		cp -a $archdir/jdk-${ver//./_}-distro-linux-i586.bin java.bin
+	fi
 	chmod +x java.bin
 	yes | ./java.bin
-	cp -a --reply=yes jdk1.5* /opt
+	cp -a -f jdk1.5* /opt
 
 	JAVA_HOME="/opt/`ls -d jdk1.5*`"
 	if [ "$ROCKCFG_JAVA_DEFAULT_JDK_JRE" == "$pkg" ] ; then
@@ -41,3 +45,6 @@ custmain="install_jdk"
 
 # don't split this package
 postflist="pkgsplits="
+
+# don't patch this package!
+patchfiles=""
diff --git a/package/java/sun-jdk15/sun-jdk15.desc b/package/java/sun-jdk15/sun-jdk15.desc
index 26aee96a9..17fb2d61f 100644
--- a/package/java/sun-jdk15/sun-jdk15.desc
+++ b/package/java/sun-jdk15/sun-jdk15.desc
@@ -41,10 +41,16 @@
 [C] extra/development
 [R] + x86
 
-[L] Commercial
-#[L] http://java.sun.com/j2se/1.5.0/jdk-1_5_0_06-license.txt
+[L] DLJ
+#[L] http://download.java.net/dlj/DLJ-v1.1.pdf
 [S] Stable
 [V] 1.5.0_06
 [P] O -?---5---9 240.300
 
-[D] X jdk-1_5_0_06-linux-i586.bin http://java.sun.com/j2se/1.5.0/download.jsp NODIST NOAUTO
+#if xpkg == sun-jdk15
+[D] 455901274 jdk-1_5_0_06-distro-linux-i586.bin http://download.java.net/dlj/binaries/ NODIST
+#endif
+
+#if xpkg == sun-jdk15-amd64
+[D] 107540031 jdk-1_5_0_06-distro-linux-amd64.bin http://download.java.net/dlj/binaries/ NODIST
+#endif
diff --git a/scripts/Check-PkgFormat b/scripts/Check-PkgFormat
index 098926bcf..d7cfd50bb 100755
--- a/scripts/Check-PkgFormat
+++ b/scripts/Check-PkgFormat
@@ -108,7 +108,7 @@ for package ; do
 			case $x in
 				Unknown|GPL|LGPL|MPL|FDL|MIT|BSD) ;;
 				OpenSource|Free-to-use|Commercial) ;;
-				IBM-Public-License) ;;
+				IBM-Public-License|DLJ) ;;
 				*) echo "$package: Unknown package" \
 				        "license: $x" ;;
 			esac