diff --git a/Makefile.in b/Makefile.in
index cec0e8f0b..d6a9e3c60 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -185,11 +185,14 @@ release-rpms:
 web:
 	cd $(NMAPDEVDIR) && $(MAKE) web
 
-clean: @LUA_CLEAN@ @LIBLINEAR_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nsock_clean nbase_clean netutil_clean my_clean @NPING_CLEAN@ @ZENMAP_CLEAN@ @NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@ @NDIFF_CLEAN@ tests/clean
-
-my_clean:
+clean: @LUA_CLEAN@ @LIBLINEAR_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ \
+nsock_clean nbase_clean netutil_clean @NPING_CLEAN@ @ZENMAP_CLEAN@ \
+@NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@ @NDIFF_CLEAN@ tests/clean
+	rm -f $(OBJS) $(TARGET)
+# Who generates dependencies.mk? If it is generated by ./configure and
+# not by make it should be moved to distclean
 	rm -f dependencies.mk
-	rm -f $(OBJS) $(TARGET) config.cache
+
 
 clean-%:
 	-cd $* && $(MAKE) clean
@@ -249,11 +252,12 @@ nping_dist_clean:
 debugclean:
 	rm -f *.gcov *.gcda *.gcno gmon.out
 
-distclean: @LUA_DIST_CLEAN@ @LIBLINEAR_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ @NPING_DIST_CLEAN@ @ZENMAP_DIST_CLEAN@ @NCAT_DIST_CLEAN@ @NMAP_UPDATE_DIST_CLEAN@ netutil_dist_clean nsock_dist_clean nbase_dist_clean @NDIFF_DIST_CLEAN@ my_clean my_distclean
-
-my_distclean:
-	rm -f Makefile Makefile.bak makefile.dep nmap_config.h stamp-h stamp-h.in \
-	         config.cache config.log config.status
+distclean: @LUA_DIST_CLEAN@ @LIBLINEAR_DIST_CLEAN@ @PCAP_DIST_CLEAN@ \
+@PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ @NPING_DIST_CLEAN@ @ZENMAP_DIST_CLEAN@ \
+@NCAT_DIST_CLEAN@ @NMAP_UPDATE_DIST_CLEAN@ netutil_dist_clean \
+nsock_dist_clean nbase_dist_clean @NDIFF_DIST_CLEAN@ clean
+	rm -f Makefile Makefile.bak makefile.dep nmap_config.h stamp-h \
+	stamp-h.in config.cache config.log config.status
 
 install-nmap: $(TARGET)
 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
@@ -481,4 +485,4 @@ zoneTrans db2-info db2-brute html-title robots.txt xmpp sql-injection \
 http-robtex-reverse-ip http-vuln-zimbra-lfi http-vuln-0-day-lfi-zimbra \
 whois db2-discover http-crossdomainxml )
 
-.PHONY: all clean install uninstall check static debug prerelease release-tarballs release-rpms web my_clean distclean lua-format
+.PHONY: all clean install uninstall check static debug prerelease release-tarballs release-rpms web distclean lua-format
diff --git a/nping/Makefile.in b/nping/Makefile.in
index fe3e7a0b9..2ada12dac 100644
--- a/nping/Makefile.in
+++ b/nping/Makefile.in
@@ -110,19 +110,18 @@ generate-tarball:
 web:	
 	cd nping-priv && ./update_web.sh
 
-clean: my_clean 
-
-my_clean:
+clean:
+	rm -f $(OBJS) $(TARGET)
+# Who generates dependencies.mk? If it is generated by ./configure and
+# not by make it should be moved to distclean
 	rm -f dependencies.mk
-	rm -f $(OBJS) $(TARGET) config.cache
+
 debugclean:
 	rm -f *.gcov *.gcda *.gcno gmon.out
 
-distclean: my_clean my_distclean
-
-my_distclean:
-	rm -f Makefile Makefile.bak makefile.dep nping_config.h stamp-h stamp-h.in \
-	         config.cache config.log config.status
+distclean: clean
+	rm -f Makefile Makefile.bak makefile.dep nping_config.h stamp-h \
+	stamp-h.in config.cache config.log config.status
 
 install-nping: $(TARGET)
 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1