diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 36dfade4769..d00bba5d442 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -94,6 +94,7 @@ cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
+export PAGER=less
 if test "\$USER" != root; then
     export NIX_REMOTE=daemon
 fi
diff --git a/system/system.nix b/system/system.nix
index 9089f451395..a45f08c7e9f 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -147,6 +147,7 @@ rec {
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
+    pkgs.man
     pkgs.module_init_tools
     pkgs.nano
     pkgs.netcat
@@ -194,7 +195,7 @@ rec {
     fullPath = pkgs.buildEnv {
       name = "boot-stage-2-path";
       paths = fullPath;
-      pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
+      pathsToLink = ["/bin" "/sbin" "/man" "/share"];
       ignoreCollisions = true;
     };
   };