diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
new file mode 100644
index 000000000000..d06c79419246
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -0,0 +1,84 @@
+{ pkgs }:
+with pkgs;
+
+rec {
+
+  libParserUtils = import ./libParserUtils.nix {
+    inherit fetchurl pkgconfig stdenv lib;
+  };
+
+  libCSS = import ./libCSS.nix {
+    inherit fetchurl stdenv lib pkgconfig libParserUtils libwapcaplet;
+    inherit (bleedingEdgeRepos) sourceByName;
+  };
+
+  libnsbmp = import ./libnsbmp.nix {
+    inherit fetchurl stdenv lib;
+  };
+
+  libnsgif = import ./libnsgif.nix {
+    inherit fetchurl stdenv lib;
+  };
+
+  libwapcaplet = import ./libwapcaplet.nix {
+    inherit fetchurl stdenv lib;
+    inherit (bleedingEdgeRepos) sourceByName;
+  };
+
+  libsvgtiny = import ./libsvgtiny.nix {
+    inherit fetchurl stdenv lib pkgconfig gperf libxml2;
+    inherit (bleedingEdgeRepos) sourceByName;
+  };
+
+  hubub = stdenv.mkDerivation {
+    name = "Hubbub-0.0.1";
+
+    src = fetchurl {
+      url = http://www.netsurf-browser.org/projects/releases/hubbub-0.0.1-src.tar.gz;
+      sha256 = "1pwcnxp3h5ysnr3nxhnwghaabri5zjaibrcarsrrnhkn2gvvv81v";
+    };
+
+    installPhase = "make PREFIX=$out install";
+    buildInputs = [pkgconfig libParserUtils];
+
+    meta = { 
+      description = "HTML5 compliant parsing library, written in C";
+      homepage = http://www.netsurf-browser.org/projects/hubbub/;
+      license = "MIT";
+      maintainers = [lib.maintainers.marcweber];
+      platforms = lib.platforms.linux;
+    };
+  };
+
+  libdom = stdenv.mkDerivation {
+    name = "libdom-devel";
+
+    src = bleedingEdgeRepos.sourceByName "libdom";
+    installPhase = "make PREFIX=$out install";
+    buildInputs = [pkgconfig];
+
+    meta = { 
+      description = "implementation of the W3C DOM, written in C";
+      homepage = http://www.netsurf-browser.org/projects/hubbub/;
+      license = "MIT";
+      maintainers = [lib.maintainers.marcweber];
+      platforms = lib.platforms.linux;
+    };
+  };
+
+  netsurfHaru = import ./haru.nix {
+    inherit fetchurl stdenv lib zlib libpng; 
+    inherit (bleedingEdgeRepos) sourceByName;
+  };
+
+  browser = import ./netsurf.nix {
+    inherit fetchurl stdenv lib pkgconfig
+      libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
+      libpng libxml2 libCSS lcms curl libmng;
+    libharu = netsurfHaru;
+    inherit (gnome) glib gtk libglade;
+    inherit (bleedingEdgeRepos) sourceByName;
+  };
+
+
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix
new file mode 100644
index 000000000000..a99ccdc0cccd
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/haru.nix
@@ -0,0 +1,22 @@
+args: with args;
+stdenv.mkDerivation {
+
+  name = "netsurf-haru-trunk";
+
+  src = sourceByName "netsurf_haru";
+
+  preConfigure = "cd upstream";
+  configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
+
+  buildInputs = [zlib libpng];
+
+  installPhase = "make PREFIX=$out install";
+
+  meta = { 
+    description = "cross platform, open source library for generating PDF files";
+    homepage = http://libharu.org/wiki/Main_Page;
+    license = "ZLIB/LIBPNG"; # see README.
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
new file mode 100644
index 000000000000..eff8e43fb743
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
@@ -0,0 +1,17 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "libCSS-devel";
+
+  src = sourceByName "libCSS";
+
+  installPhase = "make PREFIX=$out install";
+  buildInputs = [pkgconfig libParserUtils libwapcaplet];
+
+  meta = { 
+    description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf
+    homepage = http://www.netsurf-browser.org/projects/libcss/;
+    license = "MIT";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
new file mode 100644
index 000000000000..8ee8518c531c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
@@ -0,0 +1,20 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "libParserUtils-0.0.1";
+
+  src = fetchurl {
+    url = http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz;
+    sha256 = "0r9ia32kgvcfjy82xyiyihyg9yhh3l9pdzk6sp6d6gh2sbglxvas";
+  };
+
+  installPhase = "make PREFIX=$out install";
+  buildInputs = [pkgconfig];
+
+  meta = { 
+    description = "LibParserUtils is a library for building efficient parsers, written in C";
+    homepage = http://www.netsurf-browser.org/projects/libparserutils/;
+    license = "MIT";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
new file mode 100644
index 000000000000..462d532cb9c4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
@@ -0,0 +1,20 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "libnsbmp-0.0.1";
+
+  src = fetchurl {
+    url = http://www.netsurf-browser.org/projects/releases/libnsbmp-0.0.1-src.tar.gz;
+    sha256 = "1ldng20w5f725rhfns3v58x1mh3d93zwrx4c8f88rsm6wym14ka2";
+  };
+
+  installPhase = "make PREFIX=$out install";
+  buildInputs = [];
+
+  meta = { 
+    description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf
+    homepage = http://www.netsurf-browser.org/projects/libnsbmp/;
+    license = "MIT";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
new file mode 100644
index 000000000000..2ef8e8ae4325
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
@@ -0,0 +1,20 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "libnsbmp-0.0.1";
+
+  src = fetchurl {
+    url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz;
+    sha256 = "0lnvyhfdb9dm979fly33mi2jlf2rfx9ldx93viawvana63sidwsl";
+  };
+
+  installPhase = "make PREFIX=$out install";
+  buildInputs = [];
+
+  meta = { 
+    description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf
+    homepage = http://www.netsurf-browser.org/projects/libnsgif/;
+    license = "MIT";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
new file mode 100644
index 000000000000..11d81bacb126
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
@@ -0,0 +1,17 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "libsvgtiny-devel";
+
+  src = sourceByName "libsvgtiny";
+
+  installPhase = "make PREFIX=$out install";
+  buildInputs = [pkgconfig gperf libxml2];
+
+  meta = { 
+    description = "implementation of SVG Tiny, written in C";
+    homepage = http://www.netsurf-browser.org/projects/libsvgtiny/;
+    license = "MIT";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
new file mode 100644
index 000000000000..d40051a28e9b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
@@ -0,0 +1,17 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "libwapcaplet-devel";
+
+  src = sourceByName "libwapcaplet";
+
+  installPhase = "make PREFIX=$out install";
+  buildInputs = [];
+
+  meta = { 
+    description = "LibWapcaplet is a string internment library, written in C";
+    homepage = http://www.netsurf-browser.org/projects/libwapcaplet/;
+    license = "MIT";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
new file mode 100644
index 000000000000..e690171f5171
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
@@ -0,0 +1,28 @@
+args: with args;
+stdenv.mkDerivation {
+
+  name = "netsurf-devel";
+  src = sourceByName "netsurf";
+
+  # name = "netsurf-2.1";
+  /*
+  src = fetchurl {
+    url = http://www.netsurf-browser.org/downloads/releases/netsurf-2.1-src.tar.gz;
+    sha256 = "10as2skm0pklx8bb8s0z2hh72f17snavkhj7dhi8r4sjr10wz8nd";
+  };
+  */
+
+  buildInputs = [pkgconfig
+    libnsbmp libnsgif libwapcaplet libsvgtiny hubub libParserUtils
+    curl libpng libxml2 lcms glib libharu libmng
+    gtk libglade libCSS];
+
+  meta = { 
+    description = "free, open source web browser";
+    homepage = http://www.netsurf-browser.org;
+    license = ["GPLv2" /* visual worrk : */ "MIT" ];
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix
index 9be4b1b4fa18..e73d8b5a0779 100644
--- a/pkgs/development/misc/bleeding-edge-repos/default.nix
+++ b/pkgs/development/misc/bleeding-edge-repos/default.nix
@@ -82,5 +82,13 @@ args:
 
       getOptions = { type="darcs"; url="http://repetae.net/john/repos/GetOptions"; groups=""; };
       ghc_syb = { type = "git"; url = "git://github.com/nominolo/ghc-syb.git"; groups="haskell scien"; };
+
+      libCSS = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libcss"; groups = "netsurf_group"; };
+      netsurf = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/netsurf"; groups = "netsurf_group"; };
+      libwapcaplet = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libwapcaplet"; groups = "netsurf_group"; };
+      libsvgtiny = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libsvgtiny"; groups = "netsurf_group"; };
+      libdom = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; };
+      netsurf_haru = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; };
+
     } // kde4support // getConfig [ "bleedingEdgeRepos" "repos" ] {};
 }
diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix
index 25cc2426bd5e..76ea5ceaab62 100644
--- a/pkgs/misc/bleeding-edge-fetch-infos.nix
+++ b/pkgs/misc/bleeding-edge-fetch-infos.nix
@@ -267,4 +267,28 @@
     url = "http://mawercer.de/~nix/repos/MPlayer-29652.tar.gz";
     sha256 = "c202a43041d753b78777c3bb22a60068626b8a8aaf59f1d2cd054844a7c8546b";
   };
+  netsurf = args: with args; fetchurl { # Mon Sep  7 10:00:40 CEST 2009
+    url = "http://mawercer.de/~nix/repos/netsurf-9549.tar.gz";
+    sha256 = "4395ec1d4f4a305998daae3aff237398be3307b16285267a996b0a7f6a15758c";
+  };
+  libCSS = args: with args; fetchurl { # Tue Sep  8 00:41:38 CEST 2009
+    url = "http://mawercer.de/~nix/repos/libCSS-9553.tar.gz";
+    sha256 = "6e97cc97898ef1732a47063a51cec9b7ca47e672b685c23fee899e2b4d0b3c6e";
+  };
+  libwapcaplet = args: with args; fetchurl { # Thu Sep 10 21:10:43 CEST 2009
+    url = "http://mawercer.de/~nix/repos/libwapcaplet-9563.tar.gz";
+    sha256 = "242844c6146dc3ee3e151b54ba7ed9b086ef6a4e351c499af2ce10fe93c91ce6";
+  };
+  libsvgtiny = args: with args; fetchurl { # Fri Sep 11 00:06:40 CEST 2009
+    url = "http://mawercer.de/~nix/repos/libsvgtiny-9563.tar.gz";
+    sha256 = "d4ec2b2219cf48c1f6f71c5aa45922192e9f4c4cbae5871df018d70d5ca461a3";
+  };
+  libdom = args: with args; fetchurl { # Fri Sep 11 00:21:12 CEST 2009
+    url = "http://mawercer.de/~nix/repos/libdom-9563.tar.gz";
+    sha256 = "9c55cc13ec0df6a64826e0000fe844bf8091c934875a53b762ca85a3c822af17";
+  };
+  netsurf_haru = args: with args; fetchurl { # Fri Sep 11 01:18:09 CEST 2009
+    url = "http://mawercer.de/~nix/repos/netsurf_haru-9563.tar.gz";
+    sha256 = "da4eb5382af8d684e08236ad6125f413633cd37d6edc472d22a171c3fc1de584";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d66ac6be97d3..79f16fc8bd17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6983,6 +6983,9 @@ let
       motif = lesstif;
     };
 
+  netsurfBrowser = netsurf.browser;
+  netsurf = import ../applications/networking/browsers/netsurf { inherit pkgs; };
+
   nvi = import ../applications/editors/nvi {
     inherit fetchurl stdenv ncurses;
   };