diff --git a/Jamfile b/Jamfile
index 52b0adc6bc..bfcc3887bf 100644
--- a/Jamfile
+++ b/Jamfile
@@ -25,10 +25,14 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 AddHaikuImagePackages [ FFilterByBuildFeatures
 	curl freetype icu libsolv zlib
 
+	minimum_image @{
+		bash
+	}@
+
 	regular_image @{
-		bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg less
-		libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils tar
-		tiff wget which
+		bash bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
+		less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
+		tar tiff wget which
 	}@
 ] ;
 if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {
diff --git a/build/jam/images/definitions/bootstrap b/build/jam/images/definitions/bootstrap
index 78986c78e2..256ec1caf2 100644
--- a/build/jam/images/definitions/bootstrap
+++ b/build/jam/images/definitions/bootstrap
@@ -3,6 +3,10 @@
 # import everything from the minimum image
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images definitions minimum ] ;
 
+SYSTEM_BIN += [ FFilterByBuildFeatures
+	bash
+] ;
+
 # build and add the source package directory and a haikuports.config file
 CopyDirectoryToHaikuImage home haikuports
 	: [ BuildHaikuPortsSourcePackageDirectory ]
diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
index 725332fe8b..39a72e42d2 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -3,7 +3,7 @@
 SYSTEM_BIN = [ FFilterByBuildFeatures
 	"["
 	addattr alert arp
-	base64 basename bash bc beep bfsinfo
+	base64 basename bc beep bfsinfo
 	cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut
 	date dc dd desklink df diff diff3 dircolors dirname diskimage draggers
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 375d3f1006..476436351e 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp
diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku
index 6e7ffbcb92..7c1f9bb953 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index ee23d7c5b7..52f298fecc 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index a8f67e774d..8b75c09e3c 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index bab093e09f..4288ec0fed 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -22,7 +22,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index 05ba502d8a..1e150d6a74 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp