diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1f6be22ed6fb..3e8675b2168c 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -257,4 +257,10 @@ rec {
     http://archive.apache.org/dist/ # fallback for old releases
   ];
 
+  postgresql = [
+    http://ftp2.nl.postgresql.org/
+    ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/
+    ftp://ftp.postgresql.org/pub/
+  ];
+
 }
diff --git a/pkgs/servers/sql/postgresql/8.2.6.nix b/pkgs/servers/sql/postgresql/8.2.6.nix
deleted file mode 100644
index f5ce8741f86e..000000000000
--- a/pkgs/servers/sql/postgresql/8.2.6.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "postgresql-" + version;
-  LC_ALL = "en_US";
-
-  src = fetchurl {
-    url = "ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${version}/${name}.tar.bz2";
-    sha256="056ixbsfmdwhniryc0mr1kl66jywkqqhqvjdi7i3v4qzh9z34hgf";
-  };
-
-  passthru = { inherit readline; };
-  buildInputs = [zlib ncurses readline];
-}
diff --git a/pkgs/servers/sql/postgresql/8.3.0.nix b/pkgs/servers/sql/postgresql/8.3.0.nix
deleted file mode 100644
index 04244fff85bf..000000000000
--- a/pkgs/servers/sql/postgresql/8.3.0.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "postgresql-" + version;
-  LC_ALL = "en_US";
-
-  src = fetchurl {
-    url = "ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${version}/${name}.tar.bz2";
-    sha256="19kf0q45d5zd1rxffin0iblizckk8cp6fpgb52sipqkpnmm6sdc5";
-  };
-
-  passthru = { inherit readline; };
-  buildInputs = [zlib ncurses readline];
-}
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
new file mode 100644
index 000000000000..bcabe5ff6e20
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, zlib, ncurses, readline }:
+
+let version = "8.3.8"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+  
+  src = fetchurl {
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "09b0q8fd32hiawiwp0512l25vmhkn6fl3dzrk4g9nwpwcdj5d67s";
+  };
+
+  buildInputs = [zlib ncurses readline];
+
+  LC_ALL = "en_US";
+
+  passthru = { inherit readline; };
+
+  meta = {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/8.4.0.nix b/pkgs/servers/sql/postgresql/8.4.0.nix
deleted file mode 100644
index e069453ed72b..000000000000
--- a/pkgs/servers/sql/postgresql/8.4.0.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "postgresql-" + version;
-  LC_ALL = "en_US";
-
-  src = fetchurl {
-    url = "ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/source/v${version}/${name}.tar.bz2";
-    sha256="01z00pgp2dmp02dq6hnsidzvkp19gwjby0xvfpwgvd2xljs57gw4";
-  };
-
-  passthru = { inherit readline; };
-  buildInputs = [zlib ncurses readline];
-}
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
new file mode 100644
index 000000000000..352689d4ce9a
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, zlib, ncurses, readline }:
+
+let version = "8.4.1"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+  
+  src = fetchurl {
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "0z4xznaba13d00hfhzaj0xja92inc5gwp1bpk4n6l6ga782sbxc5";
+  };
+
+  buildInputs = [zlib ncurses readline];
+
+  LC_ALL = "en_US";
+
+  passthru = { inherit readline; };
+
+  meta = {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/builder.sh b/pkgs/servers/sql/postgresql/builder.sh
deleted file mode 100755
index 20e50ec1ec6f..000000000000
--- a/pkgs/servers/sql/postgresql/builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-source $stdenv/setup
-
-export LANG=en_US
-
-# configureFlags=""
-# if test "$jdbcSupport"; then
-#     configureFlags="--with-java $configureFlags"
-# fi
-
-genericBuild
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
deleted file mode 100644
index d04712d3418b..000000000000
--- a/pkgs/servers/sql/postgresql/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, zlib, ncurses, readline}:
-
-assert zlib != null;
-assert ncurses != null;
-assert readline != null;
-
-stdenv.mkDerivation {
-  name = "postgresql-8.3.0";
-
-  src = fetchurl {
-    url = http://ftp2.nl.postgresql.org/source/v8.3.0/postgresql-8.3.0.tar.bz2;
-    sha256 = "19kf0q45d5zd1rxffin0iblizckk8cp6fpgb52sipqkpnmm6sdc5";
-  };
-
-  inherit readline;
-  
-  buildInputs = [zlib ncurses readline];
-
-  LANG = "en_US"; # is this needed anymore?
-
-  meta = {
-    description = "The world's most advanced open source database";
-    homepage = http://www.postgresql.org/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4a06f0285fa..d7d92162576c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4958,11 +4958,13 @@ let
     inherit builderDefs jre;
   };
 
-  postgresql = selectVersion ../servers/sql/postgresql "8.3.0" {
+  postgresql = postgresql83;
+
+  postgresql83 = import ../servers/sql/postgresql/8.3.x.nix {
     inherit fetchurl stdenv readline ncurses zlib;
   };
 
-  postgresql84 = selectVersion ../servers/sql/postgresql "8.4.0" {
+  postgresql84 = import ../servers/sql/postgresql/8.4.x.nix {
     inherit fetchurl stdenv readline ncurses zlib;
   };