diff --git a/makehdimage b/makehdimage
index 4bbf6762df..2e8c93eda7 100755
--- a/makehdimage
+++ b/makehdimage
@@ -63,7 +63,7 @@ BEOS_BIN="touch sync ln listarea listattr listsem listport \
 	isvolume shutdown safemode sysinfo kill diff cmp more \
 	renice rmattr addattr listdev pwd chmod chown chgrp dd \
 	tee md5sum catattr query lsindex mkindex roster listimage \
-	quit open translate setvolume"
+	quit open translate setvolume waitfor"
 
 BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so libmedia.so \
 	libtranslation.so libbind.so libnetapi.so libsocket.so"
@@ -96,12 +96,7 @@ fi
 
 cd $targetDir
 
-# this avoids diskspace leaking with our current BFS version
-# (because of some unidentified bugs, of course :)
 echo
-echo "Deleting $targetDir/beos..."
-rm -rf beos
-
 echo "Creating directory structure..."
 
 mkdir -p beos/bin