diff --git a/pkgs/development/compilers/j2sdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh
similarity index 100%
rename from pkgs/development/compilers/j2sdk/builder.sh
rename to pkgs/development/compilers/jdk/builder.sh
diff --git a/pkgs/development/compilers/j2sdk/default-1.5.nix b/pkgs/development/compilers/jdk/default-1.5.nix
similarity index 100%
rename from pkgs/development/compilers/j2sdk/default-1.5.nix
rename to pkgs/development/compilers/jdk/default-1.5.nix
diff --git a/pkgs/development/compilers/j2sdk/default.nix b/pkgs/development/compilers/jdk/default.nix
similarity index 100%
rename from pkgs/development/compilers/j2sdk/default.nix
rename to pkgs/development/compilers/jdk/default.nix
diff --git a/pkgs/development/compilers/j2sdk/j2sdk-sun-linux.nix b/pkgs/development/compilers/jdk/j2sdk-sun-linux.nix
similarity index 100%
rename from pkgs/development/compilers/j2sdk/j2sdk-sun-linux.nix
rename to pkgs/development/compilers/jdk/j2sdk-sun-linux.nix
diff --git a/pkgs/development/compilers/j2sdk/j2sdk1.5-sun-linux.nix b/pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix
similarity index 66%
rename from pkgs/development/compilers/j2sdk/j2sdk1.5-sun-linux.nix
rename to pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix
index ea570912cb79..89fd6ab2a545 100644
--- a/pkgs/development/compilers/j2sdk/j2sdk1.5-sun-linux.nix
+++ b/pkgs/development/compilers/jdk/j2sdk1.5-sun-linux.nix
@@ -1,6 +1,6 @@
 /**
  * This Nix expression requires the user to download the j2sdk
- * distribution to /tmp. Please obtain j2sdk-1_5_0-beta-linux-i586.bin
+ * distribution to /tmp. Please obtain j2sdk-1_5_0_05-linux-i586.bin
  * from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
  *
  * Note that this is not necessary if someone has already pushed a
@@ -14,11 +14,11 @@ assert stdenv.system == "i686-linux";
 
 derivation {
   name = "jdk-1.5.0";
-  filename = "jdk-1_5_0_03";
-  dirname = "jdk1.5.0_03";
+  filename = "jdk-1_5_0_05";
+  dirname = "jdk1.5.0_05";
   system = stdenv.system;
   builder = ./builder.sh;
-  pathname = "/tmp/jdk-1_5_0_03-linux-i586.bin";
-  md5 = "bc221641fcfdc9268499001326fc8ebb";
+  pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin";
+  md5 = "";
   stdenv = stdenv;
 }