diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
new file mode 100644
index 00000000000..733bf02a054
--- /dev/null
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -0,0 +1,18 @@
+args:
+args.stdenv.mkDerivation {
+  name = "pgadmin3-1.8.1";
+
+  src = args.fetchurl {
+    name = "pgadmin3-v1.8.1.tar.gz";
+    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org//pgadmin3/release/v1.8.1/src/pgadmin3-1.8.1.tar.gz";
+    sha256 = "1vnpbgb2ksvcgbzab4jjspwvs5cvam53azinfavjad4kpjczdywb";
+  };
+
+  buildInputs =(with args; [postgresql wxGTK libxml2 libxslt openssl]);
+
+  meta = { 
+      description = "postgresql admin gui tool";
+      homepage = http://www.pgadmin.org/download/;
+      license = "GPL2";
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c97da6e569..cbba197e643 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3553,10 +3553,8 @@ rec {
       { # resume with resume=swap:/dev/xx
         name = "tux on ice"; # (swsusp2)
         patch = fetchurl {
-          #url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc2-for-2.6.23.1.patch.bz2";
-          #sha256 = "ef86267b6f3d7e309221f5173a881afae1dfa57418be5b3963f2380b0633ca1a";
-          url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc3-for-2.6.23.9.patch.bz2";
-          sha256 = "16f61cn0mdi7yklhdx4isi7c85843fzxq2cifd05cpsl6x6ilrfk";
+          url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc5-for-2.6.23.14.patch.bz2";
+          sha256 = "187190rxbn9x1c6bwv59mwy1zhff8nn5ad58cfiz23wa5wrk4mif";
         };
         extraConfig = "
           CONFIG_SUSPEND2=y
@@ -5296,6 +5294,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  pgadmin = import ../applications/misc/pgadmin {
+    inherit fetchurl stdenv postgresql libxml2 libxslt openssl;
+    wxGTK = wxGTK28;
+  };
+
   pgf = import ../misc/tex/pgf {
     inherit fetchurl stdenv;
   };