diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6f510800ca..62273cef888 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -748,17 +748,17 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  jre = jdkdistro false true;
-  jdk = jdkdistro true true;
 
-  jdkNoPlugin = jdkdistro true false;
+  jdk       = jdkdistro true false;
+  jre       = jdkdistro false true;
+  jdkPlugin = jdkdistro true true;
 
   jdkdistro = installjdk : pluginSupport:
     if stdenv.isDarwin then 
       "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
     else
       import ../development/compilers/jdk {
-        inherit fetchurl stdenv unzip installjdk xlibs;
+        inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
         libstdcpp5 = gcc33.gcc;
       };
 
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 8fd558c9058..eaf724bf677 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -69,7 +69,7 @@ let {
     hello
     iputils
     jakartaregexp
-    jdk
+    jdkPlugin
     jetty
     jikes
     jing_tools