diff --git a/scripts/genenv b/scripts/genenv
index 65c074e..7b279c8 100755
--- a/scripts/genenv
+++ b/scripts/genenv
@@ -13,7 +13,8 @@
 for i in $*; do
 	cp -r $i/* $tempdir
 done
-find $tempdir -name .svn |xargs rm -r
+
+find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
 
 $objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env