diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 22c4584a5b8..40b675c54ac 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1,6 +1,7 @@
 # This is a generated file.  Do not edit!
 { stdenv, fetchurl, pkgconfig, freetype, fontconfig
 , libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
+, xkeyboard_config
 }:
 
 rec {
@@ -1274,6 +1275,7 @@ rec {
       sha256 = "19jxlksl90i674yad1n7w42s3nv0hhlkwczya2lnavpl0570jr34";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
+    postInstall = "ln -sfn ${xkeyboard_config}/etc $out/share";
   }) // {inherit libX11 libxkbfile ;};
     
   showfont = (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 336f8ed5482..3eab02097df 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -44,6 +44,8 @@ $extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh
 
 $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; ";
 
+$extraAttrs{"setxkbmap"} = " postInstall = \"ln -sfn ${xkeyboard_config}/etc $out/share\"; ";
+
 # Used to avoid the following assertion error:
 # java: xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed. 
 $extraAttrs{"libxcb"} = " patches = [./xcb_xlib-no-assert-on-lock.patch]; ";
@@ -201,6 +203,7 @@ print OUT <<EOF;
 # This is a generated file.  Do not edit!
 { stdenv, fetchurl, pkgconfig, freetype, fontconfig
 , libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
+, xkeyboard_config
 }:
 
 rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a29738cac92..4397948dd36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2147,7 +2147,8 @@ rec {
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
-      libxslt expat libdrm libpng zlib perl mesa mesaHeaders;
+      libxslt expat libdrm libpng zlib perl mesa mesaHeaders
+      xkeyboard_config;
   });