diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index e3e3dafe79f1..41ae53774239 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -1,5 +1,6 @@
 {stdenv, fetchurl, libpcap, libX11, gtk, pkgconfig,
-  openssl, python, pygtk}:
+  openssl, python, pygtk, makeWrapper, pygobject,
+  pycairo, pysqlite}:
 stdenv.mkDerivation {
   name = "Nmap";
 
@@ -7,6 +8,10 @@ stdenv.mkDerivation {
     url = http://download.insecure.org/nmap/dist/nmap-4.60.tar.bz2;
     sha256 = "1jhway86lmrnyzvwi24ama1vrz89f9nmln29vr92kb31aw2nl30w";  };
 
+  postInstall =''
+    wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
+  '';
+
   buildInputs = [libpcap libX11 gtk pkgconfig openssl python 
-    pygtk];
+    pygtk makeWrapper pysqlite];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3dca2a3bd95..60cdd5e8064c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -813,7 +813,8 @@ let pkgs = rec {
 
   nmap = import ../tools/security/nmap {
     inherit fetchurl stdenv libpcap pkgconfig openssl
-      python pygtk;
+      python pygtk makeWrapper pygobject pycairo 
+      pysqlite;
     inherit (xlibs) libX11;
     inherit (gtkLibs) gtk;
   };
@@ -6222,9 +6223,11 @@ let pkgs = rec {
       pythonBindings = true; # Enable python bindings
     };
 
-    pysqlite = import ../development/libraries/pysqlite {
-      inherit stdenv fetchurl python sqlite;
-    };
+    inherit pysqlite;
+  };
+    
+  pysqlite = import ../development/libraries/pysqlite {
+    inherit stdenv fetchurl python sqlite;
   };
 
   wine = import ../misc/emulators/wine {