diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe
index 0838ab3fb..cefda5c82 100644
--- a/dev-libs/icu/icu-4.8.1.1.recipe
+++ b/dev-libs/icu/icu-4.8.1.1.recipe
@@ -4,31 +4,32 @@ LICENSE="ICU"
 COPYRIGHT="1997-2011 IBM Corporation and others."
 SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz"
 CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="icu-4.8.1.1.patch"
 
 PROVIDES="
-	icu = $portVersion compat >= 4.8
-	lib:libicudata = 48.1.1 compat >= 48
-	lib:libicui18n = 48.1.1 compat >= 48
-	lib:libicuio = 48.1.1 compat >= 48
-	lib:libicule = 48.1.1 compat >= 48
-	lib:libiculx = 48.1.1 compat >= 48
-	lib:libicutest = 48.1.1 compat >= 48
-	lib:libicutu = 48.1.1 compat >= 48
-	lib:libicuuc = 48.1.1 compat >= 48
+	icu$secondaryArchSuffix = $portVersion compat >= 4.8
+	lib:libicudata$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libicui18n$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libicuio$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libicule$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libiculx$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libicutest$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libicutu$secondaryArchSuffix = 48.1.1 compat >= 48
+	lib:libicuuc$secondaryArchSuffix = 48.1.1 compat >= 48
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
@@ -58,6 +59,15 @@ INSTALL()
 		libicuuc
 	fixPkgconfig
 
+	# Rename the data/icu directory when built for the secondary architecture,
+	# so that it doesn't clash with the primary package's.
+	if [ -n "$secondaryArchSuffix" ]; then
+		mv $dataDir/icu $dataDir/icu$secondaryArchSuffix
+		# TODO: The icu-config, the Makefile.inc, and possibly other files need
+		# to be adjusted as well. They are probably also not quite correct for
+		# the primary architecture (lib vs. develop/lib).
+	fi
+
 	# devel package
 	packageEntries devel \
 		$developDir \
@@ -95,17 +105,17 @@ Here are a few highlights of the services provided by ICU:
 
 SUMMARY_devel="The ICU development files"
 PROVIDES_devel="
-	icu_devel = $portVersion
-	cmd:icu_config = $portVersion compat >= 4.8
-	devel:libicudata = 48.1.1 compat >= 48
-	devel:libicui18n = 48.1.1 compat >= 48
-	devel:libicuio = 48.1.1 compat >= 48
-	devel:libicule = 48.1.1 compat >= 48
-	devel:libiculx = 48.1.1 compat >= 48
-	devel:libicutest = 48.1.1 compat >= 48
-	devel:libicutu = 48.1.1 compat >= 48
-	devel:libicuuc = 48.1.1 compat >= 48
+	icu${secondaryArchSuffix}_devel = $portVersion
+	cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 4.8
+	devel:libicudata${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libicui18n${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libicuio${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libicule${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libiculx${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libicutest${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libicutu${secondaryArchSuffix} = 48.1.1 compat >= 48
+	devel:libicuuc${secondaryArchSuffix} = 48.1.1 compat >= 48
 	"
 REQUIRES_devel="
-	icu == $portVersion base
+	icu${secondaryArchSuffix} == $portVersion base
 	"