diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index add9e6e83da..6b240d61470 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -121,6 +121,14 @@ rec {
     inherit fetchurl stdenv ocaml;
   };
 
+  less = (import ../tools/misc/less) {
+    inherit fetchurl stdenv ncurses;
+  };
+
+  screen = (import ../tools/misc/screen) {
+    inherit fetchurl stdenv ncurses;
+
+  };
   ### SHELLS
 
   bash = (import ../shells/bash) {
@@ -650,9 +658,6 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-  less = (import ../applications/pagers/less) {
-    inherit fetchurl stdenv ncurses;
-  };
 
   ### GAMES
 
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 9713de5ab07..b6ea3ece1aa 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -61,6 +61,7 @@ let {
     hevea
     vim
     less
+    screen
   ;};