diff --git a/Makefile b/Makefile
index 919173fe..6c6ebd06 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,15 @@ all mostlyclean clean distclean maintainer-clean:
 dist: distclean
 	false
 
-zip:
-	cd .. && rm -f upx-current.zip && zip -r upx-current.zip upx
-
 cvs-admin-ko:
 	cvs admin -ko .
 	cvs update -P -d
 
-ChangeLog:
+
+# automatically generate ChangeLog from CVS
+ChangeLog: ChangeLog.cvs
+
+ChangeLog.cvs:
 	perl $(srcdir)/scripts/cvs2cl.pl --utc -f ChangeLog.cvs
 
 ChangeLog.cvsps:
@@ -35,5 +36,3 @@ ChangeLog.cvsps:
 .PHONY: all mostlyclean clean distclean maintainer-clean
 .PHONY: dist cvs-admin-ko ChangeLog
 
-.NOEXPORT:
-
diff --git a/src/Makefile b/src/Makefile
index e4b1c407..d2112679 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,7 +38,7 @@ upx.out: $(upx_OBJECTS) $(upx_DEPENDENCIES)
 	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
 
 mostlyclean clean distclean maintainer-clean:
-	rm -f *.d *.map *.o *.res upx.out
+	rm -f *.d *.map *.o *.obj *.res upx.exe upx.out
 
 -include *.d
 .PHONY: all mostlyclean clean distclean maintainer-clean