diff --git a/Makefile.am b/Makefile.am
index 2793a7489d..0be5a61db9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ svn_version.h: generate_svn_version.sh
 # Add a stage target for staging a distribution
 
 clean-generic:
-	rm -rf stage *.gcov
+	rm -rf stage *.gcov $(BUILT_SOURCES)
 
 stage: all
 	if [ ! -d stage ] ; then mkdir stage ; fi
diff --git a/api/Makefile.am b/api/Makefile.am
index 383c2afbdf..7ec8e28892 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -100,6 +100,9 @@ $(LIBBOINC_OPENCL_STATIC): libboinc_opencl.la
 	rm -f $(LIBBOINC_OPENCL_STATIC)
 	$(LN) .libs/$(LIBBOINC_OPENCL_STATIC) .
 
+clean:
+	rm -f ${LIBBOINC_API_STATIC} ${LIBBOINC_GRAPHICS2_STATIC} ${LIBBOINC_OPENCL_STATIC}
+
 endif ## ENABLE_LIBRARIES
 
 .PHONY:
diff --git a/client/Makefile.am b/client/Makefile.am
index a85c8c1891..30f38a52d7 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -24,7 +24,7 @@ if OS_DARWIN
    LIBS += -framework IOKit -framework Foundation -framework ScreenSaver -framework Cocoa -framework CoreServices
 endif
 
-bin_PROGRAMS = boinc_client boinccmd
+bin_PROGRAMS = boinc_client boinccmd boinc
 if !OS_WIN32
 bin_PROGRAMS += switcher
 endif
diff --git a/py/Makefile.am b/py/Makefile.am
index b2ece245b7..1ab2733cf2 100644
--- a/py/Makefile.am
+++ b/py/Makefile.am
@@ -33,3 +33,7 @@ all-local:
 
 install-exec-local:
 	python setup.py install --prefix=$(prefix) --root=$(DESTDIR)
+
+clean:
+	rm -rf $(top_builddir)/py/lib.*
+
diff --git a/sched/Makefile.am b/sched/Makefile.am
index d364877ad8..7fc0b9fd3a 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -334,4 +334,4 @@ PHONY-start:
 status stop: PHONY-start
 	@test -f $@ || @LN_S@ start $@ && test -f $@
 
-CLEANFILES = status stop *.gcno *.gcda *.gcov
+CLEANFILES = status stop *.gcno *.gcda *.gcov *.a
diff --git a/zip/Makefile.am b/zip/Makefile.am
index 569f84cf6b..d0cdbcd712 100644
--- a/zip/Makefile.am
+++ b/zip/Makefile.am
@@ -81,3 +81,5 @@ $(LIBBOINC_ZIP_STATIC): libboinc_zip.la
 	rm -f $(LIBBOINC_ZIP_STATIC)
 	$(LN) .libs/$(LIBBOINC_ZIP_STATIC) .
 
+clean:
+	rm -f $(LIBBOINC_ZIP_STATIC)