diff --git a/bootstrap b/bootstrap
index 22bc498..815ac9c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -15,11 +15,12 @@ if [ "$1" = "clean" ]; then
 	if [ -f Makefile ]; then 
 		$MAKE distclean
 	fi
-	find . -name Makefile.in -print | xargs rm -f
+	find . -name Makefile.in -print0 | xargs -r0 rm -f
 	rm -f aclocal.m4 install-sh missing mkinstalldirs \
 	      stamp-h.in tags configure config.* \
 		  compile depcomp stamp-h
 	rm -rf autom4te.cache
+	find . -name '*~' -print0 | xargs -r0 rm -f
 
 else