diff --git a/Makefile b/Makefile
index 397c54a..ff17d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -577,7 +577,7 @@
 	$(cmd_sysmap) $@ System.map;                                         \
 	if [ $$? -ne 0 ]; then                                               \
 		rm -f $@;                                                    \
-		/bin/false;                                                  \
+		false;                                                       \
 	fi;
 endef
 
@@ -614,7 +614,7 @@
 	$(Q)cmp -s System.map .tmp_System.map ||                             \
 		(echo Inconsistent kallsyms data;                            \
 		 echo Try setting CONFIG_KALLSYMS_EXTRA_PASS;                \
-		 rm .tmp_kallsyms* ; /bin/false )
+		 rm .tmp_kallsyms* ; false )
 endef
 
 # Update barebox version before link
@@ -782,7 +782,7 @@
 	$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \
 		echo "  $(srctree) is not clean, please run 'make mrproper'";\
 		echo "  in the '$(srctree)' directory.";\
-		/bin/false; \
+		false; \
 	fi;
 	$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
 	$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/barebox.h ]; then  \
diff --git a/scripts/genenv b/scripts/genenv
index 374db6d..c14cd87 100755
--- a/scripts/genenv
+++ b/scripts/genenv
@@ -24,7 +24,7 @@
 done
 )
 
-find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
+find $tempdir -name '.svn' -o -name '*~' -delete
 
 $objtree/scripts/bareboxenv -s $tempdir $target