diff --git a/Makefile.in b/Makefile.in
index 005ddd4084..892441c557 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,19 +77,19 @@ ARCHIVE_TARGETS = \
         test/*.xml test/*.php test/*wu test/*result test/*output \
         test/*.html test/*input \
         tools/*.C tools/*.h tools/*.in \
-        api/*.C api/*.h api/*.in api/*.c \
+        api/*.C api/*.h api/*.in api/*.c api/*.cpp \
         RSAEuro/*/*.c RSAEuro/*/*.h RSAEuro/*/*.in RSAEuro/*/*.mak \
         mac_build/boinc.pbproj/*.pbxproj mac_build/*.lproj/*.nib/*.* \
         mac_build/*.lproj/*.strings \
         win_build/*.* win_build/*/*.dsp win_build/*/*.rct \
-        INSTALL LICENSE configure install-sh \
-        *.in *.sub *.guess *.m4
+        INSTALL LICENSE configure \
+        *.in *.sub *.guess
 
 tar: 
 	tar cf boinc_$(MAJOR_VERSION).$(MINOR_VERSION).tar $(ARCHIVE_TARGETS) ; gzip boinc_$(MAJOR_VERSION).$(MINOR_VERSION).tar
 
 zip:
-	zip boinc_$(MAJOR_VERSION).$(MINOR_VERSION).zip $(ARCHIVE_TARGETS)
+	zip -q boinc_$(MAJOR_VERSION).$(MINOR_VERSION).zip $(ARCHIVE_TARGETS)
 
 client_tar: clean
 	cd client; ./configure; ${MAKE} tar;
diff --git a/client/Makefile.in b/client/Makefile.in
index b0c5b4b854..9bc6f7e7ef 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -76,13 +76,14 @@ TEST_FX_OBJS = \
     file_xfer.o
 
 ARCHIVE_TARGETS = \
+        apps/*.C apps/*.in \
         client/*.C client/*.h client/configure \
         client/install-sh client/*.in client/*.sub client/*.guess \
         client/mac/*.h client/mac/*.cpp \
         client/win/*.h client/win/*.cpp client/win/*.rc client/win/*.aps \
         client/win/res/*.* \
         lib/*.C lib/*.c lib/*.h \
-        api/*.C api/*.h api/*.c \
+        api/*.C api/*.h api/*.in api/*.c api/*.cpp \
         RSAEuro/*/*.c RSAEuro/*/*.h RSAEuro/*/*.in RSAEuro/*/*.mak \
         mac_build/boinc.pbproj/*.pbxproj mac_build/*.lproj/*.nib/*.* \
         mac_build/*.lproj/*.strings \
@@ -115,7 +116,7 @@ tar:
 	    gzip boinc_client_$(MAJOR_VERSION).$(MINOR_VERSION).tar;
 
 zip:
-	cd $(topsrcdir)/..; zip boinc_client_$(MAJOR_VERSION).$(MINOR_VERSION).zip $(ARCHIVE_TARGETS)
+	cd $(topsrcdir)/..; zip -q boinc_client_$(MAJOR_VERSION).$(MINOR_VERSION).zip $(ARCHIVE_TARGETS)
 
 clean:
 	rm -f *.o $(PROGS) core dependencies config.cache