diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index a14b6a4f89..7b0ad68312 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -212,6 +212,9 @@ AddFilesToHaikuImage beos apps			: $(BEOS_APPS) ;
 AddFilesToHaikuImage beos preferences	: $(BEOS_PREFERENCES) ;
 AddFilesToHaikuImage beos demos			: $(BEOS_DEMOS) ;
 
+SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
+AddFilesToHaikuImage beos bin			: which ;
+
 AddSymlinkToHaikuImage beos bin : sh : bash ;
 
 AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
diff --git a/data/bin/which b/data/bin/which
new file mode 100755
index 0000000000..8d8d3583f3
--- /dev/null
+++ b/data/bin/which
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. /etc/profile &> /dev/null
+
+whence $*
+