diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 1230a936c87..4d7e4978045 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,17 +1,38 @@
-args: with args;
-stdenv.mkDerivation {
-	name = "poppler-0.6.1";
+{ fetchurl, stdenv, qt4Support ? false, qt4 ? null
+, cairo, freetype, fontconfig, zlib, libjpeg
+, pkgconfig, glib, gtk }:
+
+assert qt4Support -> (qt4 != null);
+
+stdenv.mkDerivation rec {
+	name = "poppler-0.8.4";
+
 	src = fetchurl {
-		url = http://poppler.freedesktop.org/poppler-0.6.1.tar.gz;
-		sha256 = "1wiz7m36wr4l0ihnawl7ww2ai0cx81ly5ych9wmyh348py4jgyyl";
+		url = "http://poppler.freedesktop.org/${name}.tar.gz";
+		sha256 = "0yi590vgqwjqmqspflxycbnfxjdcwa1fx9ark3diav3yn105gga5";
 	};
 
-	propagatedBuildInputs = [qt4 zlib glib cairo freetype fontconfig libjpeg gtk];
+	buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
+    ++ (if qt4Support then [qt4] else []);
 
 	configureFlags = "--enable-shared --disable-static --enable-exceptions
-	--enable-cairo --enable-splash --enable-poppler-glib --enable-zlib";
+	--enable-cairo --enable-splash --enable-poppler-glib --enable-zlib "
+  + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
 
-	patches = [ ./GDir-const.patch ./datadir_env.patch ./use_exceptions.patch ];
+	patches = [ ./GDir-const.patch
+
+              # XXX: This patch no longer applies, what was the point of it?
+              # ./datadir_env.patch
+
+              ./use_exceptions.patch ];
 
 	preConfigure = "sed -e '/jpeg_incdirs/s@/usr@${libjpeg}@' -i configure";
+
+  doCheck = true;
+
+  meta = {
+    homepage = http://poppler.freedesktop.org/;
+    description = "Poppler, a PDF rendering library";
+    license = "GPLv2";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d8d889a282..3d5ab00bd86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3291,8 +3291,10 @@ let pkgs = rec {
   };
 
   poppler = import ../development/libraries/poppler {
-    inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg;
+    inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
+      pkgconfig;
     inherit (gtkLibs) glib gtk;
+    qt4Support = getConfig [ "poppler" "qt4Support" ] false;
   };
 
   popt = import ../development/libraries/popt {