diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index fbbae495666..008eb991a6a 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups
+{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype
 , which, jdk, nettools, xorg, file
 , fontconfig, cpio, cacert, perl, setJavaClassPath }:
 
@@ -22,6 +22,11 @@ let
   # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
   paxflags = if stdenv.isi686 then "msp" else "m";
 
+  cupsSrc = fetchurl {
+    url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2;
+    md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -50,6 +55,10 @@ stdenv.mkDerivation rec {
 
     sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
       openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
+
+    tar xf ${cupsSrc}
+    cupsDir=$(echo $(pwd)/cups-*)
+    makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir)
   '';
 
   patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ];
@@ -63,7 +72,6 @@ stdenv.mkDerivation rec {
     "FREETYPE_LIB_PATH=${freetype}/lib"
     "MILESTONE=release"
     "BUILD_NUMBER=b${build}"
-    "CUPS_HEADERS_PATH=${cups}/include"
     "USRBIN_PATH="
     "COMPILER_PATH="
     "DEVTOOLS_PATH="
@@ -158,7 +166,7 @@ stdenv.mkDerivation rec {
     homepage = http://openjdk.java.net/;
     license = "GPLv2";
     description = "The open-source Java Development Kit";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.linux;
   };