diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
new file mode 100644
index 000000000000..7e8523fae40e
--- /dev/null
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -0,0 +1,33 @@
+a :  
+let 
+  s = import ./src-for-default.nix;
+  buildInputs = with a; [
+    libpng libjpeg bzip2 zlib libtiff
+    directfb libX11 libXau xproto gpm
+    openssl libXt pkgconfig
+  ];
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = [
+    "--enable-graphics"
+    "--with-ssl"
+    "--with-x"
+    "--with-fb"
+    ];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "A small browser with some graphics support";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms; 
+      linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/links2/src-for-default.nix b/pkgs/applications/networking/browsers/links2/src-for-default.nix
new file mode 100644
index 000000000000..7e7da1a4641b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/links2/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="2.2";
+   name="links2-2.2";
+   hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
+   url="http://links.twibright.com/download/links-${version}.tar.gz";
+   advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
+  
+  
+}
diff --git a/pkgs/applications/networking/browsers/links2/src-info-for-default.nix b/pkgs/applications/networking/browsers/links2/src-info-for-default.nix
new file mode 100644
index 000000000000..b678b251298e
--- /dev/null
+++ b/pkgs/applications/networking/browsers/links2/src-info-for-default.nix
@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://links.twibright.com/download.php";
+  baseName = "links2";
+}
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index 0a00c676ef9f..3a887704a214 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, perl}:
+{stdenv, fetchurl, perl, zlib, libjpeg, freetype, 
+  SDL, libX11, xproto, xextproto, libXext, libpng}:
 
 stdenv.mkDerivation {
   name = "directfb-1.1.0";
@@ -6,5 +7,11 @@ stdenv.mkDerivation {
     url = http://www.directfb.org/downloads/Core/DirectFB-1.1.0.tar.gz;
     sha256 = "0fpjlgsyblvcjvqk8m3va2xsyx512mf26kwfsxarj1vql9b75s0f";
   };
-  buildInputs = [perl];
+  buildInputs = [perl zlib libjpeg freetype SDL
+    xproto libX11 libXext xextproto libpng];
+  configureFlags = [
+    "--enable-sdl"
+    "--enable-zlib"
+    "--with-gfxdrivers=all"
+    ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22cb3dee3526..9ab1464a0478 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3245,7 +3245,9 @@ let
   };
 
   directfb = import ../development/libraries/directfb {
-    inherit fetchurl stdenv perl;
+    inherit fetchurl stdenv perl zlib libjpeg freetype
+      SDL libpng;
+    inherit (xlibs) libX11 libXext xproto xextproto;
   };
 
   enchant = makeOverridable 
@@ -7354,6 +7356,12 @@ let
     inherit fetchurl stdenv;
   };
 
+  links2 = (builderDefsPackage ../applications/networking/browsers/links2) {
+    inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff directfb
+      gpm openssl SDL SDL_image SDL_net pkgconfig;
+    inherit (xlibs) libX11 libXau xproto libXt;
+  };
+
   lynx = import ../applications/networking/browsers/lynx {
     inherit fetchurl stdenv ncurses openssl;
   };