diff --git a/dev-libs/icu/icu-55.1.recipe b/dev-libs/icu/icu-55.1.recipe
index d82c9fb34..6ce586859 100644
--- a/dev-libs/icu/icu-55.1.recipe
+++ b/dev-libs/icu/icu-55.1.recipe
@@ -1,11 +1,14 @@
 SUMMARY="International Components for Unicode (ICU)"
 HOMEPAGE="http://www.icu-project.org"
 LICENSE="ICU"
-COPYRIGHT="1997-2014 IBM Corporation and others."
+COPYRIGHT="1997-2015 IBM Corporation and others."
 SRC_URI="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-src.tgz"
+SRC_URI_2="http://www.iana.org/time-zones/repository/releases/tzdata2015d.tar.gz#noarchive"
+SRC_URI_3="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-data.zip#noarchive"
 CHECKSUM_SHA256="e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b"
-
-REVISION="1"
+CHECKSUM_SHA256_2="8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531"
+CHECKSUM_SHA256_3="84ae6a6512b6f38b417497d05e4ed90d8fa7447b46db9905032354c8574b8f59"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -48,6 +51,9 @@ PATCHES="icu-55.1.patchset"
 BUILD()
 {
 	cd source
+	cp ../../../sources-2/tzdata*.tar.gz tools/tzcode/
+	unzip -oq ../../../sources-3/icu4c-*-data.zip
+	rm -f data/in/icudt??l.dat
 	autoconf
 	runConfigure ./configure \
 		--disable-renaming --disable-samples --disable-extras
diff --git a/dev-libs/icu/icu-54.1.recipe b/dev-libs/icu/icu54-54.1.recipe
similarity index 96%
rename from dev-libs/icu/icu-54.1.recipe
rename to dev-libs/icu/icu54-54.1.recipe
index e01df235e..50d0de8e1 100644
--- a/dev-libs/icu/icu-54.1.recipe
+++ b/dev-libs/icu/icu54-54.1.recipe
@@ -8,12 +8,12 @@ SRC_URI_3="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-54_1-d
 CHECKSUM_SHA256="d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3"
 CHECKSUM_SHA256_2="556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62"
 CHECKSUM_SHA256_3="ad99d024cd06de90f78ea9c3f145c456ab4a021d2110bd110a986a50d3f2b2b7"
-REVISION="5"
+REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	icu$secondaryArchSuffix = $portVersion compat >= 54
+	icu54$secondaryArchSuffix = $portVersion compat >= 54
 	lib:libicudata$secondaryArchSuffix = 54.1 compat >= 54
 	lib:libicui18n$secondaryArchSuffix = 54.1 compat >= 54
 	lib:libicuio$secondaryArchSuffix = 54.1 compat >= 54
@@ -149,7 +149,7 @@ wrapping when displaying the text.
 
 SUMMARY_devel="The ICU development files"
 PROVIDES_devel="
-	icu${secondaryArchSuffix}_devel = $portVersion
+	icu54${secondaryArchSuffix}_devel = $portVersion
 	cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 54
 	devel:libicudata${secondaryArchSuffix} = 54.1 compat >= 54
 	devel:libicui18n${secondaryArchSuffix} = 54.1 compat >= 54
@@ -161,5 +161,8 @@ PROVIDES_devel="
 	devel:libicuuc${secondaryArchSuffix} = 54.1 compat >= 54
 	"
 REQUIRES_devel="
-	icu${secondaryArchSuffix} == $portVersion base
+	icu54${secondaryArchSuffix} == $portVersion base
+	"
+CONFLICTS_devel="
+	icu${secondaryArchSuffix}_devel
 	"