diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh
new file mode 100644
index 000000000000..0b5b11f0028a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla/builder.sh
@@ -0,0 +1,53 @@
+. $stdenv/setup
+
+preConfigure=preConfigure
+preConfigure() {
+    cat > .mozconfig <<EOF
+#. \$topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=$out
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+#ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+#ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+#ac_add_options --with-system-zlib
+EOF
+}
+
+#postInstall=postInstall
+postInstall() {
+
+    # Strip some more stuff
+    strip -S $out/lib/*/* || true
+
+    # We don't need this (do we?)
+#    rm -rf $out/include
+
+    # This fixes starting Firefox when there already is a running
+    # instance.  The `firefox' wrapper script actually expects to be
+    # in the same directory as `run-mozilla.sh', apparently.
+    cd $out/bin
+    mv firefox ../lib/firefox-*/
+    ln -s ../lib/firefox-*/firefox .
+
+    # Register extension etc.
+    echo "running firefox -register..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
+
+    echo "running regxpcom..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
+    
+#    echo "running regchrome..."
+#    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
+    
+}
+
+makeFlags="-f client.mk build"
+
+genericBuild
diff --git a/pkgs/applications/networking/browsers/mozilla/default.nix b/pkgs/applications/networking/browsers/mozilla/default.nix
new file mode 100644
index 000000000000..cb7573eb8a14
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
+
+# !!! assert libIDL.glib == gtk.glib;
+
+stdenv.mkDerivation {
+  name = "mozilla-1.7.12";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.12/source/mozilla-1.7.12-source.tar.bz2;
+    md5 = "f1ad6adbbc0510eb76d352c94c801fac";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
+  inherit gtk;
+
+  #patches = [./writable-copies.patch];
+}
diff --git a/pkgs/applications/networking/browsers/mozilla/default.nix.old b/pkgs/applications/networking/browsers/mozilla/default.nix.old
new file mode 100644
index 000000000000..17d1a38fe134
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla/default.nix.old
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, perl, zip, gtk}:
+
+stdenv.mkDerivation {
+  name = "mozilla-1.7.12";
+
+  src = fetchurl {
+    url = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.12/source/mozilla-1.7.12-source.tar.bz2;
+    md5 = "f1ad6adbbc0510eb76d352c94c801fac";
+  };
+  buildInputs = [perl zip gtk];
+
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b8ce888fa35c..60b49a109faf 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1427,6 +1427,13 @@ rec {
     qt = qt3;
   };
 
+  mozilla = (import ../applications/networking/browsers/mozilla) {
+    inherit fetchurl pkgconfig stdenv perl zip;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) libIDL;
+    inherit (xlibs) libXi;
+  };
+
   firefox = (import ../applications/networking/browsers/firefox) {
     inherit fetchurl stdenv pkgconfig perl zip;
     inherit (gtkLibs) gtk;