diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 41fa4828455..b51741e17e5 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -275,6 +275,8 @@ rec {
 
   openssh = (import ../tools/networking/openssh) {
     inherit fetchurl stdenv zlib openssl;
+    inherit (xlibs) xauth;
+    xforwarding = true;
   };
 
   mktemp = (import ../tools/security/mktemp) {
@@ -295,11 +297,6 @@ rec {
     inherit (xlibs) libX11;
   };
 
-  xauth = (import ../tools/X11/xauth) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (xlibs) libX11 libXau libXext libXmu;
-  };
-
    
   ### SHELLS