diff --git a/common/shlibs b/common/shlibs
index 34c31af48c9..736de8c9eeb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -455,13 +455,14 @@ libblktap.so.3.0 xen-libs-4.2.2_2
 libfsimage.so.1.0 xen-libs-4.2.2_2
 libbabl-0.1.so.0 babl-0.1.10_1
 libgegl-0.2.so.0 gegl-0.2.0_1
-libiculx.so.49 icu-libs-49.1.2_1
-libicule.so.49 icu-libs-49.1.2_1
-libicuio.so.49 icu-libs-49.1.2_1
-libicui18n.so.49 icu-libs-49.1.2_1
-libicudata.so.49 icu-libs-49.1.2_1
-libicutu.so.49 icu-libs-49.1.2_1
-libicuuc.so.49 icu-libs-49.1.2_1
+libiculx.so.54 icu-libs-54.1_1
+libicule.so.54 icu-libs-54.1_1
+libicuio.so.54 icu-libs-54.1_1
+libicui18n.so.54 icu-libs-54.1_1
+libicudata.so.54 icu-libs-54.1_1
+libicutu.so.54 icu-libs-54.1_1
+libicuuc.so.54 icu-libs-54.1_1
+libicutest.so.53 icu-libs-54..1_1
 libaspell.so.15 aspell-0.60_1
 libpspell.so.15 aspell-0.60_1
 libhunspell-1.2.so.0 hunspell-1.2.8_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 90baf33f6e6..478589e3fcc 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -1,17 +1,17 @@
 # Template build file for 'icu'.
 pkgname=icu
-version=49.1.2
-_distver="49_1_2"
-revision=6
+version=54.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
+hostmakedepends="pkg-config"
 short_desc="Robust and full-featured Unicode services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.icu-project.org/"
 license="ICU License /usr/share/licenses/icu/license.html"
-distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${_distver}-src.tgz"
-checksum=cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3
+distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${version//./_}-src.tgz"
+checksum=d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
@@ -22,14 +22,15 @@ pre_configure() {
 		# Configure and build for host.
 		mkdir host-build
 		cd host-build
-		env CC=gcc LD=ld CXX=g++ AR=ar RANLIB=ranlib \
+		env CC=cc LD=ld CXX=g++ AR=ar RANLIB=ranlib \
 			AS=as STRIP=strip CFLAGS="-Os" CXXFLAGS="-Os" \
 			../configure --prefix=/
 		make ${makejobs}
 		mkdir -p ${wrksrc}/host-icu/config
-		cp config/icucross.mk ${wrksrc}/host-icu/config
+		cp config/icucross.* ${wrksrc}/host-icu/config
 		make DESTDIR=${wrksrc}/host-icu install
 		mv ${wrksrc}/host-icu/sbin/* ${wrksrc}/host-icu/bin
+		make distclean
 		# libicudata must be linked to libc, otherwise it's soft-float.
 		# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457
 		sed -e 's,-nostdlib,,g' -i ${wrksrc}/source/config/mh-linux
@@ -37,7 +38,7 @@ pre_configure() {
 }
 
 post_install() {
-	vinstall $wrksrc/license.html 644 usr/share/licenses/icu
+	vlicense $wrksrc/license.html
 }
 
 icu-devel_package() {
@@ -53,7 +54,6 @@ icu-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 icu-libs_package() {
 	short_desc+=" - shared libs"
 	pkg_install() {