diff --git a/Makefile.in b/Makefile.in
index 5fc0cfc29..527c9e535 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -187,7 +187,7 @@ web:
 clean: @LUA_CLEAN@ @LIBLINEAR_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ \
 clean-nsock clean-nbase clean-netutil @NPING_CLEAN@ @ZENMAP_CLEAN@ \
 @NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@ @NDIFF_CLEAN@ clean-tests
-	rm -f $(OBJS) $(TARGET)
+	rm -f $(OBJS) main.o $(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
@@ -274,7 +274,7 @@ distclean-zenmap: clean-zenmap
 	-cd $(ZENMAPDIR) && rm -rf MANIFEST build/ dist/ INSTALLED_FILES
 
 distclean-ndiff: clean-ndiff
-	-cd $(NDIFFDIR) && rm -rf build/ dist/
+	-cd $(NDIFFDIR) && rm -rf build/ dist/ INSTALLED_FILES
 
 distclean-nping:
 	-cd $(NPINGDIR) && $(MAKE) distclean
diff --git a/libpcap/Makefile.in b/libpcap/Makefile.in
index 577b84850..73fe0eea3 100644
--- a/libpcap/Makefile.in
+++ b/libpcap/Makefile.in
@@ -716,6 +716,7 @@ distclean: clean
 	rm -f Makefile config.cache config.log config.status \
 	    config.h gnuc.h net os-proto.h bpf_filter.c pcap-config \
 	    stamp-h stamp-h.in
+	rm -f version.h version.c
 	rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
 	rm -rf autom4te.cache
 
diff --git a/nsock/src/Makefile.in b/nsock/src/Makefile.in
index 7e7668f86..29497c2d6 100644
--- a/nsock/src/Makefile.in
+++ b/nsock/src/Makefile.in
@@ -64,7 +64,7 @@ clean: clean-test
 	rm -f $(OBJS) $(TARGET)
 
 distclean: clean
-	rm -f Makefile makefile.dep config.log config.status ../include/nsock_config.h
+	rm -f Makefile makefile.dep config.log config.status ../include/nsock_config.h $(NSOCKTESTDIR)/Makefile
 
 depend:
 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)