diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix
new file mode 100644
index 00000000000..c7c92cd6c27
--- /dev/null
+++ b/pkgs/data/misc/xkeyboard-config/0.9.nix
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 00000000000..de67b00baea
--- /dev/null
+++ b/pkgs/data/misc/xkeyboard-config/1.2.nix
@@ -0,0 +1,22 @@
+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/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
index 6b7d263da7f..91d21f76143 100644
--- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
+++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
@@ -44,7 +44,7 @@ xkb_symbols "altgr-intl" {
     key <AE03> { [	  3,	numbersign,	threesuperior,	dead_macron	] };
     key <AE04> { [	  4,	dollar,		currency,	sterling	] };
     key <AE05> { [	  5,	percent,		EuroSign		] };
-    key <AE06> { [	  6,	asciicircum,		dead_circumflex		] };
+    key <AE06> { [	  6,	asciicircum,	dead_circumflex, dead_stroke	] };
     key <AE07> { [	  7,	ampersand,		dead_horn		] };
     key <AE08> { [	  8,	asterisk,		dead_ogonek		] };
     key <AE09> { [	  9,	parenleft,  leftsinglequotemark,dead_breve	] };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 018784c1937..2787f9119a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3824,11 +3824,14 @@ rec {
     inherit fetchurl stdenv cabextract;
   };
 
-  xkeyboard_config = import ../data/misc/xkeyboard-config {
-    inherit fetchurl stdenv perl perlXMLParser;
+  xkeyboard_configFun = lib.sumArgs (selectVersion ../data/misc/xkeyboard-config ) {
+    inherit fetchurl stdenv perl perlXMLParser gettext;
     inherit (xlibs) xkbcomp;
+    version = "1.2";
   };
 
+  xkeyboard_config = xkeyboard_configFun null;
+
 
   ### APPLICATIONS
 
@@ -5194,6 +5197,13 @@ rec {
     inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
   };
 
+  /*tetexX11 = import ../misc/tex/tetex {
+    inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
+    inherit (xlibs) libX11 libXext libXmu libXaw libXt libXpm;
+    inherit freetype t1lib;
+    builderX11 = true;
+  };*/
+
   texFunctions = import ../misc/tex/nix {
     inherit stdenv perl tetex graphviz ghostscript;
   };