diff --git a/Jamfile b/Jamfile
index c9487b239b..a19f49f7f1 100644
--- a/Jamfile
+++ b/Jamfile
@@ -157,6 +157,9 @@ if $(HAIKU_ADD_OPTIONAL_PACKAGES) {
 		[ FSplitString $(HAIKU_ADD_OPTIONAL_PACKAGES) : / ] ;
 }
 
+#include packages that are required by all images.
+AddOptionalHaikuImagePackages MandatoryPackages ; 
+
 # Evaluate optional package dependencies and prepare the optional build
 # features before parsing the Jamfile tree.
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 237446cbc8..a3479d298c 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -17,6 +17,7 @@ OptionalPackageDependencies Python : Bzip ;
 OptionalPackageDependencies Mercurial : Python ;
 OptionalPackageDependencies Git : Expat Curl OpenSSL ;
 OptionalPackageDependencies Curl : OpenSSL ;
+OptionalPackageDependencies MandatoryPackages : Sed ;
 OptionalPackageDependencies NetFS : UserlandFS ;
 OptionalPackageDependencies Vim : LibIconv ;
 OptionalPackageDependencies XZ-Utils : Tar ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index e7e232c328..5ede9e055b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -15,7 +15,6 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	ABI-compliance-checker	- tool for checking ABI compatibility between libs
 #	APR						- support libraries used for example by Subversion
 #	APR-util				- Apache portable runtime utility library
-#	BasicCommandLineTools	- basic commandline tools
 #	Beam					- powerful native e-mail client
 #	BeBook					- the classic BeOS API documentation
 #	BeHappy					- special documentation (i.e. BeBook) browser
@@ -55,6 +54,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	Perl					- the scripting language
 #	Python					- the scripting language
 #	Rsync					- remote directory synchronization
+#	Sed						- the ultimate stream editor
 #	SQLite					- the database implementation
 #	Subversion				- the version control system
 #	Tar						- archiving utility
@@ -110,20 +110,6 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
 }
 
 
-# BasicCommandLineTools
-if [ IsOptionalHaikuImagePackageAdded BasicCommandLineTools ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package BasicCommandLineTools available for $(TARGET_ARCH)" ;
-	} else {
-		# sed
-		InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
-			: $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
-			:
-			: true ;
-	}
-}
-
-
 # Beam
 if [ IsOptionalHaikuImagePackageAdded Beam ] {
 	if $(TARGET_ARCH) != x86 {
@@ -928,6 +914,20 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] {
 }
 
 
+# Sed
+if [ IsOptionalHaikuImagePackageAdded Sed ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Sed available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+			: $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+			:
+			:
+		;
+	}
+}
+
+
 # SQLite
 if [ IsOptionalHaikuImagePackageAdded SQLite ] {
 	if $(TARGET_ARCH) != x86 {
diff --git a/build/jam/ReleaseBuildProfiles b/build/jam/ReleaseBuildProfiles
index dc0d9e23b8..a8752cc8e7 100644
--- a/build/jam/ReleaseBuildProfiles
+++ b/build/jam/ReleaseBuildProfiles
@@ -14,7 +14,6 @@ switch $(HAIKU_BUILD_PROFILE) {
 		HAIKU_IMAGE_HOST_NAME = shredder ;
 		HAIKU_IMAGE_SIZE = 650 ;
 
-		AddOptionalHaikuImagePackages BasicCommandLineTools ;
 		AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision
 			VLC WonderBrush ;
 		AddOptionalHaikuImagePackages CVS Development Git Mercurial
@@ -34,7 +33,6 @@ switch $(HAIKU_BUILD_PROFILE) {
 		HAIKU_IMAGE_HOST_NAME = shredder ;
 		HAIKU_IMAGE_SIZE = 450 ;
 
-		AddOptionalHaikuImagePackages BasicCommandLineTools ;
 		AddOptionalHaikuImagePackages Pe Nano Vision P7zip ;
 		AddOptionalHaikuImagePackages Development Subversion OpenSSH ;
 	}