diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b8fb9c452293..41b4ce4d1393 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -202,7 +202,13 @@ rec {
     inherit fetchurl stdenv libjpeg;
     inherit (xlibs) libX11;
   };
- 
+
+  xauth = (import ../tools/X11/xauth) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (xlibs) libX11 libXau libXext libXmu;
+  };
+
+   
   ### SHELLS
 
   bash = (import ../shells/bash) {
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index af90e2f3d36d..4548f5093f5f 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -90,6 +90,7 @@ let {
     openssl
     mktemp
     strace
+    xauth
     qt3
     xmltv
     mythtv
diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix
new file mode 100644
index 000000000000..82cb4e29f7cb
--- /dev/null
+++ b/pkgs/tools/X11/xauth/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libX11, libXau, libXext, libXmu}:
+
+stdenv.mkDerivation {
+  name = "xauth-7.0";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/xauth-7.0.tar.bz2;
+    md5 = "d597005016baa8af81a5b0e38951d563";
+  };
+  buildInputs = [pkgconfig libX11 libXau libXext libXmu];
+}