diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix
deleted file mode 100644
index c7c92cd6c27b..000000000000
--- a/pkgs/data/misc/xkeyboard-config/0.9.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
-
-  src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
-  };
-
-  buildInputs = [perl perlXMLParser xkbcomp];
-
-  ICONV = "iconv";
-
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
-
-  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled
-	cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
-  '';
-}
diff --git a/pkgs/data/misc/xkeyboard-config/1.2.nix b/pkgs/data/misc/xkeyboard-config/1.2.nix
deleted file mode 100644
index de67b00baeab..000000000000
--- a/pkgs/data/misc/xkeyboard-config/1.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-${version}";
-
-  src = fetchurl {
-          url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2;
-          sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4";
-        };
-  buildInputs = [perl perlXMLParser xkbcomp gettext];
-
-  ICONV = "iconv";
-
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
-
-  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled || true;
-	cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us
-  '';
-}
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 31836d24ecf9..c36f83aa153e 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchurl, perl, perlXMLParser, xkbcomp}:
+{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
 
 stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
+  name = "xkeyboard-config-1.4";
 
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
+    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2;
+    sha256 = "1qdhhc5ji8677dna9qj6kisgpfzhpjmaavdjzvvrv9chrxyqa6lj";
   };
 
-  buildInputs = [perl perlXMLParser xkbcomp];
+  buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
 
   ICONV = "iconv";
 
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
+  preConfigure = ''
+    configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
+  '';
 
   postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled
-	cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
+    cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
   '';
 }
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
deleted file mode 100644
index 14e62bbc7d7d..000000000000
--- a/pkgs/development/tools/misc/intltool/0.36.2.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.meta.function {
-		src = /* put a fetchurl here */
-	fetchurl {
-		url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
-		sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj";
-	};
-
-		propagatedBuildInputs = [perl perlXMLParser];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "intltool-0.36.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [minInit addInputs doUnpack 
-			(doDump "1") doConfigure doMakeInstall 
-			doPropagate doForceShare]);
-	inherit propagatedBuildInputs;
-	meta = {
-		description = "
-	Internalization tool for XML.
-";
-		inherit src;
-	};
-}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8fc7110fccd6..39505619738d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1934,7 +1934,7 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2;
       sha256 = "1h809xl9kpx0r9ynvjfk7wy6rx8pgl1i14qh29r150wf73h06i10";
     };
-    buildInputs = [pkgconfig libX11 libxkbfile ];
+    buildInputs = [pkgconfig libX11 libxkbfile ]; NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\""; 
   }) // {inherit libX11 libxkbfile ;};
     
   xkbevd = (stdenv.mkDerivation {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 445f9909a865..b2e3fa78ff6a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -62,6 +62,9 @@ $extraAttrs{"xf86inputevdev"} = "
 $extraAttrs{"libXpm"} = "
     patchPhase = \"sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in\";";
 
+$extraAttrs{"xkbcomp"} = " NIX_CFLAGS_COMPILE = \"-DDFLT_XKB_CONFIG_ROOT=\\\"/etc/X11/xkb\\\"\"; ";
+
+
 my $downloadCache = "./download-cache";
 $ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
 mkdir $downloadCache, 0755;
@@ -202,7 +205,7 @@ while (<>) {
 
 print "\nWRITE OUT\n";
 
-open OUT, ">default2.nix";
+open OUT, ">default.nix";
 
 print OUT "";
 print OUT <<EOF;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19620c9e637..31d2b09dc3b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2976,10 +2976,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  intltool = composedArgsAndFun (selectVersion ../development/tools/misc/intltool "0.36.2") {
-    inherit fetchurl stdenv lib builderDefs stringsWithDeps
-      perl perlXMLParser;
-  };
+  intltool = gnome.intltool;
 
   jasper = import ../development/libraries/jasper {
     inherit fetchurl stdenv unzip libjpeg freeglut mesa;
@@ -5783,8 +5780,8 @@ let
     inherit builderDefs;
   };
 
-  xkeyboard_config = composedArgsAndFun (selectVersion ../data/misc/xkeyboard-config "1.2") {
-    inherit fetchurl stdenv perl perlXMLParser gettext;
+  xkeyboard_config = import ../data/misc/xkeyboard-config {
+    inherit fetchurl stdenv perl perlXMLParser gettext intltool;
     inherit (xlibs) xkbcomp;
   };