diff --git a/system/etc.nix b/system/etc.nix
index 8d023dff05c..029f651c5e2 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -5,6 +5,10 @@ let
   optional = option: file:
     if config.get option then [file] else [];
 
+  defaultEnv = pkgs.writeText "environment" "
+    PATH=${systemPath}/bin:${systemPath}/sbin
+  ";
+
 in
     
 import ../helpers/make-etc.nix {
@@ -98,6 +102,7 @@ import ../helpers/make-etc.nix {
           pkgs.xorg.fontbh100dpi
           pkgs.xorg.fontbhlucidatypewriter100dpi
           pkgs.ttf_bitstream_vera
+          pkgs.corefonts
           pkgs.freefont_ttf
         ];
         buildInputs = [pkgs.libxslt];
@@ -130,6 +135,7 @@ import ../helpers/make-etc.nix {
             then pkgs.pam_ldap
             else "/no-such-path";
           inherit (pkgs.xorg) xauth;
+          inherit defaultEnv;
         };
         target = "pam.d/" + program;
       }
diff --git a/system/etc/pam.d/sshd b/system/etc/pam.d/sshd
index c3fad16bbef..e77a987ea2a 100644
--- a/system/etc/pam.d/sshd
+++ b/system/etc/pam.d/sshd
@@ -2,3 +2,4 @@ auth     include        common-auth
 account  include        common-account
 password include        common-password
 session  include        common-session
+session  optional       pam_env.so envfile=@defaultEnv@