diff --git a/bootstrap b/bootstrap
index 02385fefd..18b27b96f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,5 +1,26 @@
 #! /bin/sh
 cd `dirname $0`
+
+if test "$1" = "clean"; then
+	find . -name Makefile.in -print0 | xargs -r0 rm -f
+	find . -name '*~' -type f -print0 | xargs -r0 rm -f
+	find . -name '*.rej' -type f -print0 | xargs -r0 rm -f
+	find . -name '*.orig' -type f -print0 | xargs -r0 rm -f
+	rm -f aclocal.m4 build-stamp changelog-stamp config.cache config.log \
+		  config.status configure configure-stamp install-sh libtool missing \
+		  mkinstalldirs quakeforge-config quakeforge.lsm
+	rm -f compile config.guess config.sub depcomp ltmain.sh
+	rm -rf autom4te.cache
+
+	cd -
+	find . -name Makefile -print0 | xargs -r0 rm -f
+	rm -f RPM/build_rpm RPM/quakeforge.conf RPM/quakeforge.spec RPM/rpmmacros
+	find . -name '*.o' -type f -print0 | xargs -r0 rm -f
+	find . -name '*.lo' -type f -print0 | xargs -r0 rm -f
+	find . -name '.libs' -type d -print0 | xargs -r0 rm -rf
+	find . -name '.deps' -type d -print0 | xargs -r0 rm -rf
+	exit 0
+fi
 # Check libtoolize version, fix for Debian/Woody
 lt=`which libtoolize`
 if test -n "$lt" ; then