diff --git a/Jamfile b/Jamfile
index 6aaebbc7d0..8b5eb5aca8 100644
--- a/Jamfile
+++ b/Jamfile
@@ -147,6 +147,8 @@ if $(HAIKU_OPENSSL_ENABLED) {
 	AddOptionalHaikuImagePackages OpenSSL ;
 }
 
+AddOptionalHaikuImagePackages ICU ;
+
 # Evaluate optional package dependencies 
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ; 
 
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 1f02f90e91..4f997cbf54 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -89,6 +89,6 @@ if $(TARGET_ARCH) != x86 {
 		: $(zipFile)
 	] ;
 
-	HAIKU_ICU_HEADERS
-		= [ FDirName $(HAIKU_ICU_DIR) common include ] ;
+	#HAIKU_ICU_HEADERS
+	#	= [ FDirName $(HAIKU_ICU_DIR) common include ] ;
 }
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 1439626cf2..c5f8f97b20 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -15,7 +15,7 @@ OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
 OptionalPackageDependencies ICU-devel : Development ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies Tar : LibIconv ;
-OptionalPackageDependencies MandatoryPackages : Sed Tar ;
+OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
 OptionalPackageDependencies Python : Bzip ;
 OptionalPackageDependencies Mercurial : Python ;
 OptionalPackageDependencies NetFS : UserlandFS ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 027368dcc6..7eaeb53cd8 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -749,6 +749,21 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
 }
 
 
+# ICU
+if [ IsOptionalHaikuImagePackageAdded ICU ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package ICU available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage $(HAIKU_ICU_PACKAGE)
+			: $(HAIKU_ICU_URL)
+			:
+			:
+			: true
+		;
+	}
+}
+
+
 # KeymapSwitcher
 if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
 	if $(TARGET_ARCH) != x86 {