diff --git a/pkgs/applications/networking/browsers/lynx/builder.sh b/pkgs/applications/networking/browsers/lynx/builder.sh
new file mode 100644
index 00000000000..d24d19b1614
--- /dev/null
+++ b/pkgs/applications/networking/browsers/lynx/builder.sh
@@ -0,0 +1,5 @@
+. $stdenv/setup
+
+export CFLAGS="-I$ncurses/include/ncurses"
+
+genericBuild
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
new file mode 100644
index 00000000000..f98ff83682f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, ncurses
+, sslSupport ? true, openssl ? null
+}:
+
+assert sslSupport -> openssl != null;
+
+stdenv.mkDerivation {
+  name = "lynx-2.8.5";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://lynx.isc.org/release/lynx2.8.5.tar.bz2;
+    md5 = "d1e5134e5d175f913c16cb6768bc30eb";
+  };
+  inherit ncurses;
+  configureFlags = (if sslSupport then "--with-ssl" else "");
+  buildInputs = [ncurses (if sslSupport then openssl else null)];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 6b287ba686b..c139cc20a4b 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -595,6 +595,10 @@ rec {
     inherit (gnome) libIDL;
   };
 
+  lynx = (import ../applications/networking/browsers/lynx) {
+    inherit fetchurl stdenv ncurses openssl;
+  };
+
   MPlayer = (import ../applications/video/MPlayer) {
     inherit fetchurl stdenv freetype x11 zlib;
     inherit (xlibs) libXv;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index f9d7fda968e..f9d8620abad 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -46,6 +46,7 @@ let {
     pan
     sylpheed
     firefox
+    lynx
     MPlayer
     MPlayerPlugin
     vlc