diff --git a/Makefile.in b/Makefile.in
index 4b5a147a1..99c0c4bf2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,6 +57,7 @@ TARGET = nmap
 INSTALLNSE=@INSTALLNSE@
 BUILDZENMAP=@BUILDZENMAP@
 INSTALLZENMAP=@INSTALLZENMAP@
+UNINSTALLZENMAP=@UNINSTALLZENMAP@
 
 ifneq (@LIBLUA_LIBS@,)
 NSE_SRC=nse_main.cc nse_auxiliar.cc nse_nsock.cc nse_init.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_string.cc 
@@ -235,11 +236,23 @@ install-nse: $(TARGET)
 install: install-nmap $(INSTALLNSE) $(INSTALLZENMAP)
 	@echo "NMAP SUCCESSFULLY INSTALLED"
 
-uninstall:
-	rm -f $(DESTDIR)$(bindir)/$(TARGET) $(DESTDIR)$(bindir)/xnmap
-	rm -f $(DESTDIR)$(mandir)/man1/$(TARGET).1 $(DESTDIR)$(mandir)/man1/zenmap.1
+uninstall: uninstall-nmap $(UNINSTALLZENMAP)
+
+uninstall-nmap:
+	rm -f $(DESTDIR)$(bindir)/$(TARGET)
+	rm -f $(DESTDIR)$(mandir)/man1/$(TARGET).1
 	rm -rf $(DESTDIR)$(nmapdatadir) $(DESTDIR)$(nmaplibexecdir)
 
+uninstall-zenmap:
+# This is not a complete uninstall for Zenmap. It only uninstalls the
+# things installed by this makefile.
+	rm -f $(DESTDIR)$(mandir)/man1/zenmap.1
+# Uninstall nmapfe only if it's a symlink.
+	if [ -L $(DESTDIR)$(bindir)/nmapfe ]; then \
+		rm -f $(DESTDIR)$(bindir)/nmapfe; \
+	fi
+	rm -f $(DESTDIR)$(bindir)/xnmap
+
 ${srcdir}/configure: configure.ac 
 	cd ${srcdir} && autoconf
 
diff --git a/configure b/configure
index 5892765b0..5f0b76229 100755
--- a/configure
+++ b/configure
@@ -689,6 +689,7 @@ pyexecdir
 pkgpyexecdir
 BUILDZENMAP
 INSTALLZENMAP
+UNINSTALLZENMAP
 ZENMAP_CLEAN
 ZENMAP_DIST_CLEAN
 OPENSSL_LIBS
@@ -5645,11 +5646,13 @@ fi
 if test "$with_zenmap" = "no"; then
   BUILDZENMAP=""
   INSTALLZENMAP=""
+  UNINSTALLZENMAP=""
   ZENMAP_CLEAN=""
   ZENMAP_DIST_CLEAN=""
 else
   BUILDZENMAP=build-zenmap
   INSTALLZENMAP=install-zenmap
+  UNINSTALLZENMAP=uninstall-zenmap
   ZENMAP_CLEAN=zenmap_clean
   ZENMAP_DIST_CLEAN=zenmap_dist_clean
 fi
@@ -5658,6 +5661,7 @@ fi
 
 
 
+
 # We test whether they specified openssl desires explicitly
 use_openssl="yes"
 specialssldir=""
@@ -9123,6 +9127,7 @@ pyexecdir!$pyexecdir$ac_delim
 pkgpyexecdir!$pkgpyexecdir$ac_delim
 BUILDZENMAP!$BUILDZENMAP$ac_delim
 INSTALLZENMAP!$INSTALLZENMAP$ac_delim
+UNINSTALLZENMAP!$UNINSTALLZENMAP$ac_delim
 ZENMAP_CLEAN!$ZENMAP_CLEAN$ac_delim
 ZENMAP_DIST_CLEAN!$ZENMAP_DIST_CLEAN$ac_delim
 OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
@@ -9143,7 +9148,6 @@ LIBDNETDIR!$LIBDNETDIR$ac_delim
 DNET_DEPENDS!$DNET_DEPENDS$ac_delim
 DNET_BUILD!$DNET_BUILD$ac_delim
 DNET_CLEAN!$DNET_CLEAN$ac_delim
-DNET_DIST_CLEAN!$DNET_DIST_CLEAN$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -9185,6 +9189,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+DNET_DIST_CLEAN!$DNET_DIST_CLEAN$ac_delim
 LIBLUA_LIBS!$LIBLUA_LIBS$ac_delim
 LIBLUADIR!$LIBLUADIR$ac_delim
 LUA_DEPENDS!$LUA_DEPENDS$ac_delim
@@ -9204,7 +9209,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index c3371a793..663aab386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,16 +189,19 @@ fi
 if test "$with_zenmap" = "no"; then
   BUILDZENMAP=""
   INSTALLZENMAP=""
+  UNINSTALLZENMAP=""
   ZENMAP_CLEAN=""
   ZENMAP_DIST_CLEAN=""
 else
   BUILDZENMAP=build-zenmap
   INSTALLZENMAP=install-zenmap
+  UNINSTALLZENMAP=uninstall-zenmap
   ZENMAP_CLEAN=zenmap_clean
   ZENMAP_DIST_CLEAN=zenmap_dist_clean
 fi
 AC_SUBST(BUILDZENMAP)
 AC_SUBST(INSTALLZENMAP)
+AC_SUBST(UNINSTALLZENMAP)
 AC_SUBST(ZENMAP_CLEAN)
 AC_SUBST(ZENMAP_DIST_CLEAN)