diff --git a/Makefile b/Makefile
index f2e4a282..45ceb2a0 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,11 @@ _default:
 	@echo "read the makefile"
 
 clean:
+	rm -f *.o *.so *.pyc *~ koji*.bz2 koji*.src.rpm
+	rm -rf koji-$(VERSION)
+	for d in $(SUBDIRS); do make -s -C $$d clean; done
+
+git-clean:
 	@git clean -d -q -x
 
 subdirs: