diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 6d4fa97c8cb7..aac15789a2db 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,18 +1,25 @@
 { stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "pgadmin3-1.10.0";
+  name = "pgadmin3-${version}";
+  version = "1.16.1";
 
   src = fetchurl {
-    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz";
-    sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
+    url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
+    sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl";
   };
 
   buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
-  meta = { 
+  preConfigure = ''
+    substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
+  '';
+
+  meta = with stdenv.lib; { 
     description = "PostgreSQL administration GUI tool";
     homepage = http://www.pgadmin.org;
-    license = "GPL2";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.iElectric ];
+    platforms = platforms.unix;
   };
 }