diff --git a/src/.cvsignore b/src/.cvsignore
index 0d3d2c57..6eb5a1d5 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -10,15 +10,11 @@ GNUmakefile
 *.rel
 *.res
 *.pdb
+*.out
 *.upx
 .gdbinit
 .Attic
 .deps
-B
 compress_nrv.*
 upx
-upx_nrv
-upx_nrv.*
-upx_ucl
-upx_ucl.*
 version1*.h
diff --git a/src/Makefile b/src/Makefile
index f2bf3804..820d11ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,13 +32,13 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=.o))
 all: upx.out
 
 upx.out: $(upx_OBJECTS) $(upx_DEPENDENCIES)
-	$(strip $(CXXLD) $(call m,CPPFLAGS) $(call m,CXXFLAGS) $(call m,LDFLAGS) -o $@ $(upx_OBJECTS) $(upx_OJBECTS) $(LIBS))
+	$(strip $(CXXLD) $(call m,CPPFLAGS) $(call m,CXXFLAGS) $(call m,LDFLAGS) -o $@ $(upx_OBJECTS) $(upx_OJBECTS) $(call m,LIBS))
 
 %.o : %.cpp
 	$(strip $(CXX) $(call m,CPPFLAGS) $(call m,CXXFLAGS) -o $@ -c $<)
 
 clean:
-	rm -f *.d *.o upx.out
+	rm -f *.d *.map *.o *.res upx.out
 
 -include *.d
 .PHONY: all clean