diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index a96e703b28cf..bbf1efcf5238 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -1,15 +1,13 @@
 { productVersion
 , patchVersion
-, buildVersion
 , sha256
 , jceName
-, releaseToken
 , sha256JCE
 }:
 
 { swingSupport ? true
 , stdenv
-, fetchurl
+, requireFile
 , makeWrapper
 , unzip
 , file
@@ -55,14 +53,14 @@ let
     x86_64-linux  = "amd64";
     armv7l-linux  = "arm";
     aarch64-linux = "aarch64";
-  }.${stdenv.hostPlatform.system};
+  }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
 
   jce =
     if installjce then
-      fetchurl {
-        url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}";
+      requireFile {
+        name = jceName;
+        url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";
         sha256 = sha256JCE;
-        curlOpts = "-b oraclelicense=a";
       }
     else
       "";
@@ -76,25 +74,23 @@ let
 
 in
 
-assert sha256 ? ${stdenv.hostPlatform.system};
-
 let result = stdenv.mkDerivation rec {
-  name =
-    if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
+  pname = if installjdk then "oraclejdk" else "oraclejre";
+  version = "${productVersion}u${patchVersion}";
 
-  src = let
-    platformName = {
-      i686-linux    = "linux-i586";
-      x86_64-linux  = "linux-x64";
-      armv7l-linux  = "linux-arm32-vfp-hflt";
-      aarch64-linux = "linux-arm64-vfp-hflt";
-    }.${stdenv.hostPlatform.system};
-    javadlPlatformName = "linux-i586";
-  in fetchurl {
-   url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
-   curlOpts = "-b oraclelicense=a";
-   sha256 = sha256.${stdenv.hostPlatform.system};
-  };
+  src =
+    let
+      platformName = {
+        i686-linux    = "linux-i586";
+        x86_64-linux  = "linux-x64";
+        armv7l-linux  = "linux-arm32-vfp-hflt";
+        aarch64-linux = "linux-arm64-vfp-hflt";
+      }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
+    in requireFile {
+      name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
+      url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html";
+      sha256 = sha256.${stdenv.hostPlatform.system};
+    };
 
   nativeBuildInputs = [ file ]
     ++ stdenv.lib.optional installjce unzip;
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
new file mode 100644
index 000000000000..ed313a9d00e7
--- /dev/null
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -0,0 +1,10 @@
+import ./jdk-linux-base.nix {
+  productVersion = "8";
+  patchVersion = "241";
+  sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4";
+  sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1";
+  sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24";
+  sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l";
+  jceName = "jce_policy-8.zip";
+  sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
+}
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
deleted file mode 100644
index d9ee5010f7cf..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
-import ./jdk-linux-base.nix {
-  productVersion = "8";
-  patchVersion = "211";
-  buildVersion = "12";
-  sha256.i686-linux = "0mdrljs0rw9s4pvaa3sn791nqgdrp8749z3qn80y7hhad74kvsnp";
-  sha256.x86_64-linux = "13b6qk4sn8jdhxa22na9d2aazm4yjh6yxrlxr189gxy3619y9dy0";
-  sha256.armv7l-linux = "1ij1x925k7lyp5f98gy8r0xfr41qhczf2rb74plwwmrccc1k00p5";
-  sha256.aarch64-linux = "041r615qj9qy34a9gxm8968qlmf060ba2as5w97v86mbik4rca05";
-  releaseToken = "478a62b7d4e34b78b671c754eaaf38ab";
-  jceName = "jce_policy-8.zip";
-  sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-}
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
deleted file mode 100644
index 9fab02ab5361..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
-import ./jdk-linux-base.nix {
-  productVersion = "8";
-  patchVersion = "212";
-  buildVersion = "10";
-  sha256.i686-linux = "03dj9q0bi3ib731f4zl9hylkrgw417h6qlg2wi7nw71b0fqhijn1";
-  sha256.x86_64-linux = "1yzddxzfh6h14bpzis1abp52x4jjljg8a3zyqz483q6qm05caq1i";
-  sha256.armv7l-linux = "0x333alkqdx8mmiirair7g5iiwif5v9ka4j3qr0f42ilvmk8csnx";
-  sha256.aarch64-linux = "0vcbdvcsl8rm47i07s93jmrrs5laibf937d8vacjqqgh9bbhsr2c";
-  releaseToken = "59066701cf1a433da9770636fbc4c9aa";
-  jceName = "jce_policy-8.zip";
-  sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afad70ae6022..87e4235cf339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8456,14 +8456,10 @@ in
 
   oraclejdk8 = pkgs.oraclejdk8distro true false;
 
-  oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;
-
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
 
-  oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
-
   jrePlugin = jre8Plugin;
 
   jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -8472,13 +8468,7 @@ in
 
   oraclejdk8distro = installjdk: pluginSupport:
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix {
-        inherit installjdk pluginSupport;
-      });
-
-  oraclejdk8psu_distro = installjdk: pluginSupport:
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix {
+      (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix {
         inherit installjdk pluginSupport;
       });