diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 9ceea47d22cc..58bddfbc4042 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1 +1 @@
-import ./gettext-0.14.6.nix
+import ./gettext-0.16.x.nix
diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix
new file mode 100644
index 000000000000..c6c7b8782557
--- /dev/null
+++ b/pkgs/development/libraries/qt-4/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl
+, libXft, pkgconfig, libX11, inputproto
+, xrenderSupport ? true, libXrender ? null
+, xrandrSupport ? true, libXrandr ? null, randrproto ? null
+, xineramaSupport ? true, libXinerama ? null, xineramaproto ? null
+, cursorSupport ? true, libXcursor ? null, libXext ? null
+, mysqlSupport ? true, mysql ? null
+, openglSupport ? false, mesa ? null, libXmu ? null
+, cupsSupport ? true, cups ? null
+, dbusSupport ? true, dbus ? null
+, xfixesSupport ? true, fixesproto ? null, libXfixes ? null
+, smSupport ? true, libICE ? null, libSM ? null
+, freetypeSupport ? true, fontconfig ? null, freetype ? null
+, glibSupport ? true, glib ? null
+, openssl, xextproto, zlib, libjpeg, libpng, which
+}:
+
+assert xrenderSupport -> libXrender != null;
+assert xrandrSupport -> libXrandr != null && randrproto != null;
+assert cursorSupport -> libXcursor != null && libXext != null;
+assert mysqlSupport -> mysql != null;
+assert openglSupport -> mesa != null && libXmu != null;
+assert dbusSupport -> dbus != null;
+assert cupsSupport -> cups != null;
+assert glibSupport -> glib != null;
+assert smSupport -> libICE != null && libSM != null;
+assert freetypeSupport -> fontconfig != null && freetype != null;
+
+stdenv.mkDerivation {
+  name = "qt-4.3.0";
+
+  hook = ./setup-hook.sh;  
+  src = fetchurl {
+    url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.0.tar.gz;
+    sha256 = "0h0liy7sdp5sarhzdfn7ss61d4ky9h0ky8jysg8v3a97sds7ghxb";
+  };
+
+  buildInputs = [libXft libXrender libXrandr randrproto xextproto libXinerama xineramaproto libXcursor zlib libjpeg mysql libpng which mesa libXmu openssl dbus cups pkgconfig libXext freetype fontconfig inputproto fixesproto libXfixes glib];
+
+  patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf";
+  dontAddPrefix = 1;
+  postConfigure = "export LD_LIBRARY_PATH=$(pwd)/lib";
+  configureFlags = "
+    -v -no-separate-debug-info -release
+    -system-zlib -system-libpng -system-libjpeg
+    -qt-gif -confirm-license
+    ${if openglSupport then "-opengl" else "-no-opengl"}
+    ${if xrenderSupport then "-xrender" else "-no-xrender"}
+    ${if xrandrSupport then "-xrandr" else "-no-xrandr"}
+    ${if xineramaSupport then "-xinerama" else "-no-xinerama"}
+    ${if cursorSupport then "-xcursor" else "-no-xcursor"}
+    ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
+    ${if dbusSupport then "-qdbus" else "-no-qdbus"}
+    ${if cupsSupport then "-cups" else "-no-cups"}
+    ${if glibSupport then "-glib" else "-no-glib"}
+    ${if xfixesSupport then "-xfixes" else "-no-xfixes"}
+    ${if freetypeSupport then "-fontconfig -I${freetype}/include/freetype2" else "-no-fontconfig"}
+  ";
+  preConfigure="export configureFlags=\"\$configureFlags -prefix \$out\"";
+
+  passthru = {inherit mysqlSupport;};
+}
diff --git a/pkgs/development/libraries/qt-4/setup-hook.sh b/pkgs/development/libraries/qt-4/setup-hook.sh
new file mode 100755
index 000000000000..db1a2529ff54
--- /dev/null
+++ b/pkgs/development/libraries/qt-4/setup-hook.sh
@@ -0,0 +1 @@
+export QTDIR=@out@
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f813e8105bbd..906e6035a978 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1699,6 +1699,16 @@ rec {
     mysqlSupport = false;
   };
 
+  # Builds, but not tested yet
+  qt4 = (import ./qt-4) {
+    inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig;
+    inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
+      libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext inputproto fixesproto libXfixes;
+    inherit (gnome) glib;
+    openglSupport = mesaSupported;
+    mysqlSupport = true;
+  };
+
   readline = readline5;
 
   readline4 = import ../development/libraries/readline/readline4.nix {