diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412c201a522b..4a514450f327 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6420,18 +6420,6 @@ let
       if kernel.features ? fbConDecor && system != "x86_64-linux" then splashutils_15 else
       null;
 
-    splashutils_13 = import ../os-specific/linux/splashutils/1.3.nix {
-      inherit fetchurl stdenv klibc;
-      zlib = zlibStatic;
-      libjpeg = libjpegStatic;
-    };
-
-    splashutils_15 = import ../os-specific/linux/splashutils/1.5.nix {
-      inherit fetchurl stdenv klibc;
-      zlib = zlibStatic;
-      libjpeg = libjpegStatic;
-    };
-
     ext3cowtools = import ../os-specific/linux/ext3cow-tools {
       inherit stdenv fetchurl;
       kernel_ext3cowpatched = kernel;
@@ -6678,6 +6666,18 @@ let
     inherit fetchurl stdenv;
   };
 
+  splashutils_13 = import ../os-specific/linux/splashutils/1.3.nix {
+    inherit fetchurl stdenv klibc;
+    zlib = zlibStatic;
+    libjpeg = libjpegStatic;
+  };
+
+  splashutils_15 = import ../os-specific/linux/splashutils/1.5.nix {
+    inherit fetchurl stdenv klibc;
+    zlib = zlibStatic;
+    libjpeg = libjpegStatic;
+  };
+
   squashfsTools = import ../os-specific/linux/squashfs {
     inherit fetchurl stdenv zlib;
   };
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 884a22a0e08b..75d35134b759 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -98,6 +98,7 @@ let
       kbd
       kcachegrind
       kdebase
+      klibc
       ktorrent
       kvm
       less
@@ -160,6 +161,8 @@ let
       seccure
       slim
       spidermonkey
+      splashutils_13
+      splashutils_15
       ssmtp
       strace
       su
@@ -242,36 +245,26 @@ let
       inherit (pkgs.kernelPackages_2_6_23)
         iwlwifi
         kernel
-        klibc
-        splashutils
         ;
     };
     kernelPackages_2_6_25 = pkgs.recurseIntoAttrs {
       inherit (pkgs.kernelPackages_2_6_25)
         kernel
-        klibc
-#        splashutils
         ;
     };
     kernelPackages_2_6_26 = pkgs.recurseIntoAttrs {
       inherit (pkgs.kernelPackages_2_6_26)
         kernel
-        klibc
-#        splashutils
         ;
     };
     kernelPackages_2_6_27 = pkgs.recurseIntoAttrs {
       inherit (pkgs.kernelPackages_2_6_27)
         kernel
-        klibc
-#        splashutils
         ;
     };
     kernelPackages_2_6_28 = pkgs.recurseIntoAttrs {
       inherit (pkgs.kernelPackages_2_6_28)
         kernel
-        klibc
-#        splashutils
         ;
     };
   };