diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 923346d670a7..8f6211a19433 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -1,80 +1,82 @@
 # Created by: dwm
 # $FreeBSD$
 
 PORTNAME=	icu
-PORTVERSION=	57.1
+PORTVERSION=	55.1
+PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \
 		SF/${PORTNAME}/ICU4C/${PORTVERSION}/
 DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	International Components for Unicode (from IBM)
 
 LICENSE=	ICU
 LICENSE_NAME=	ICU license
 LICENSE_FILE=	${WRKSRC}/../license.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	THREADS
 OPTIONS_DEFAULT=	THREADS
 THREADS_DESC=	Build thread-safe version of the library
 
 USE_LDCONFIG=		yes
 
 WRKSRC=			${WRKDIR}/icu/source
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-data-packaging=library \
 			--disable-samples \
 			--enable-release \
 			--enable-shared \
 			--enable-static
 
 .if defined(X_BUILD_FOR)
 CONFIGURE_ARGS+=	--with-cross-build
 .endif
 
+
 USES=			gmake pathfix
 
 ICUMAJOR=	${PORTVERSION:C/\..*//}
 PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION}
 
 # This builds thread-safe, but not the thread-using version:
 THREADS_CONFIGURE_ON=	--enable-weak-threads
 THREADS_CONFIGURE_OFF=	--enable-threads=no
 
 .include <bsd.port.options.mk>
 
 # For all Bigendian systems, set CPPFLAGS so that icu compiles and checks correctly
 .if ${ARCH} == "mips" || ${ARCH} == "mips64" || ${ARCH} == "sparc64" || ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
 CPPFLAGS+=	-DU_IS_BIG_ENDIAN=1
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \
 		${WRKSRC}/configure
 .if ! ${PORT_OPTIONS:MTHREADS}
 	@${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=,g' ${WRKSRC}/config/mh-bsd-gcc
 .endif
 
 iotest cintltst intltest:
 	# Performing the ${.TARGET} test
 	-${MAKE_CMD} -C ${WRKSRC}/test
 	cd ${WRKSRC}/test/${.TARGET} && ${SETENV} \
 	    LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/tools/ctestfw \
 	    ./${.TARGET}
 
 post-stage:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
 		${STAGEDIR}${PREFIX}/bin/*conv \
 		${STAGEDIR}${PREFIX}/bin/icuinfo \
 		${STAGEDIR}${PREFIX}/bin/derb \
 		${STAGEDIR}${PREFIX}/bin/pkgdata
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libicuda*.so.*
 
-do-test regression-test: iotest cintltst intltest
+test regression-test: iotest cintltst intltest
 
 .include <bsd.port.mk>
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 26b29c40a625..57f78850bb0e 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,2 @@
-TIMESTAMP = 1464596691
-SHA256 (icu4c-57_1-src.tgz) = ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581
-SIZE (icu4c-57_1-src.tgz) = 22360664
+SHA256 (icu4c-55_1-src.tgz) = e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b
+SIZE (icu4c-55_1-src.tgz) = 25600847
diff --git a/devel/icu/files/patch-config__mh-bsd-gcc b/devel/icu/files/patch-config__mh-bsd-gcc
index 13c6acd6e4ae..d5576fd75111 100644
--- a/devel/icu/files/patch-config__mh-bsd-gcc
+++ b/devel/icu/files/patch-config__mh-bsd-gcc
@@ -1,12 +1,12 @@
---- config/mh-bsd-gcc.orig	2016-03-23 20:50:50 UTC
-+++ config/mh-bsd-gcc
-@@ -23,9 +23,6 @@ LD_RPATH_PRE=	-Wl,-rpath,
+--- ./config/mh-bsd-gcc.orig	2011-10-19 01:13:00.000000000 +0200
++++ ./config/mh-bsd-gcc	2012-01-14 21:01:17.083384507 +0100
+@@ -23,9 +23,6 @@
  ## Compiler switch to embed a library name
  LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
  
 -## Shared library options
 -LD_SOOPTIONS= -Wl,-Bsymbolic
 -
  ## Shared object suffix
  SO = so
  ## Non-shared intermediate object suffix
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 268bd6b9769d..1e52caaec70b 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -1,261 +1,259 @@
 sbin/icupkg
 sbin/gensprep
 sbin/gennorm2
 sbin/gencmn
 sbin/genccode
 lib/libicudata.a
 lib/libicudata.so
 lib/libicudata.so.%%ICUMAJOR%%
 lib/libicudata.so.%%ICUVER%%
 lib/libicui18n.a
 lib/libicui18n.so
 lib/libicui18n.so.%%ICUMAJOR%%
 lib/libicui18n.so.%%ICUVER%%
 lib/libicuio.a
 lib/libicuio.so
 lib/libicuio.so.%%ICUMAJOR%%
 lib/libicuio.so.%%ICUVER%%
 lib/libicule.a
 lib/libicule.so
 lib/libicule.so.%%ICUMAJOR%%
 lib/libicule.so.%%ICUVER%%
 lib/libiculx.a
 lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
 lib/libiculx.so.%%ICUVER%%
 lib/libicutest.a
 lib/libicutest.so
 lib/libicutest.so.%%ICUMAJOR%%
 lib/libicutest.so.%%ICUVER%%
 lib/libicutu.a
 lib/libicutu.so
 lib/libicutu.so.%%ICUMAJOR%%
 lib/libicutu.so.%%ICUVER%%
 lib/libicuuc.a
 lib/libicuuc.so
 lib/libicuuc.so.%%ICUMAJOR%%
 lib/libicuuc.so.%%ICUVER%%
 lib/icu/pkgdata.inc
 lib/icu/current
 lib/icu/Makefile.inc
 lib/icu/%%ICUVER%%/pkgdata.inc
 lib/icu/%%ICUVER%%/Makefile.inc
 libdata/pkgconfig/icu-io.pc
 libdata/pkgconfig/icu-le.pc
 libdata/pkgconfig/icu-i18n.pc
 libdata/pkgconfig/icu-lx.pc
 libdata/pkgconfig/icu-uc.pc
 include/layout/LEFontInstance.h
 include/layout/LEGlyphFilter.h
 include/layout/LEGlyphStorage.h
 include/layout/LEInsertionList.h
 include/layout/LELanguages.h
 include/layout/LEScripts.h
 include/layout/LESwaps.h
 include/layout/LETableReference.h
 include/layout/LETypes.h
 include/layout/LayoutEngine.h
 include/layout/ParagraphLayout.h
 include/layout/RunArrays.h
 include/layout/loengine.h
 include/layout/playout.h
 include/layout/plruns.h
 include/unicode/alphaindex.h
 include/unicode/appendable.h
 include/unicode/basictz.h
 include/unicode/brkiter.h
 include/unicode/bytestream.h
 include/unicode/bytestrie.h
 include/unicode/bytestriebuilder.h
 include/unicode/calendar.h
 include/unicode/caniter.h
 include/unicode/chariter.h
 include/unicode/choicfmt.h
 include/unicode/coleitr.h
 include/unicode/coll.h
 include/unicode/compactdecimalformat.h
 include/unicode/curramt.h
 include/unicode/currpinf.h
 include/unicode/currunit.h
 include/unicode/datefmt.h
 include/unicode/dbbi.h
 include/unicode/dcfmtsym.h
 include/unicode/decimfmt.h
 include/unicode/docmain.h
 include/unicode/dtfmtsym.h
 include/unicode/dtintrv.h
 include/unicode/dtitvfmt.h
 include/unicode/dtitvinf.h
 include/unicode/dtptngen.h
 include/unicode/dtrule.h
 include/unicode/enumset.h
 include/unicode/errorcode.h
 include/unicode/fieldpos.h
 include/unicode/filteredbrk.h
 include/unicode/fmtable.h
 include/unicode/format.h
 include/unicode/fpositer.h
 include/unicode/gender.h
 include/unicode/gregocal.h
 include/unicode/icudataver.h
 include/unicode/icuplug.h
 include/unicode/idna.h
 include/unicode/listformatter.h
 include/unicode/localpointer.h
 include/unicode/locdspnm.h
 include/unicode/locid.h
 include/unicode/measfmt.h
 include/unicode/measunit.h
 include/unicode/measure.h
 include/unicode/messagepattern.h
 include/unicode/msgfmt.h
 include/unicode/normalizer2.h
 include/unicode/normlzr.h
 include/unicode/numfmt.h
 include/unicode/numsys.h
 include/unicode/parseerr.h
 include/unicode/parsepos.h
 include/unicode/platform.h
 include/unicode/plurfmt.h
 include/unicode/plurrule.h
 include/unicode/ptypes.h
 include/unicode/putil.h
 include/unicode/rbbi.h
 include/unicode/rbnf.h
 include/unicode/rbtz.h
 include/unicode/regex.h
 include/unicode/region.h
 include/unicode/reldatefmt.h
 include/unicode/rep.h
 include/unicode/resbund.h
 include/unicode/schriter.h
 include/unicode/scientificnumberformatter.h
 include/unicode/search.h
 include/unicode/selfmt.h
-include/unicode/simpleformatter.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
 include/unicode/std_string.h
 include/unicode/strenum.h
 include/unicode/stringpiece.h
 include/unicode/stringtriebuilder.h
 include/unicode/stsearch.h
 include/unicode/symtable.h
 include/unicode/tblcoll.h
 include/unicode/timezone.h
 include/unicode/tmunit.h
 include/unicode/tmutamt.h
 include/unicode/tmutfmt.h
 include/unicode/translit.h
 include/unicode/tzfmt.h
 include/unicode/tznames.h
 include/unicode/tzrule.h
 include/unicode/tztrans.h
 include/unicode/ubidi.h
 include/unicode/ubrk.h
 include/unicode/ucal.h
 include/unicode/ucasemap.h
 include/unicode/ucat.h
 include/unicode/uchar.h
 include/unicode/ucharstrie.h
 include/unicode/ucharstriebuilder.h
 include/unicode/uchriter.h
 include/unicode/uclean.h
 include/unicode/ucnv.h
 include/unicode/ucnv_cb.h
 include/unicode/ucnv_err.h
 include/unicode/ucnvsel.h
 include/unicode/ucol.h
 include/unicode/ucoleitr.h
 include/unicode/uconfig.h
 include/unicode/ucsdet.h
 include/unicode/ucurr.h
 include/unicode/udat.h
 include/unicode/udata.h
 include/unicode/udateintervalformat.h
 include/unicode/udatpg.h
 include/unicode/udisplaycontext.h
 include/unicode/uenum.h
 include/unicode/ufieldpositer.h
 include/unicode/uformattable.h
 include/unicode/ugender.h
 include/unicode/uidna.h
 include/unicode/uiter.h
 include/unicode/uldnames.h
 include/unicode/ulistformatter.h
 include/unicode/uloc.h
 include/unicode/ulocdata.h
 include/unicode/umachine.h
 include/unicode/umisc.h
 include/unicode/umsg.h
 include/unicode/unifilt.h
 include/unicode/unifunct.h
 include/unicode/unimatch.h
 include/unicode/unirepl.h
 include/unicode/uniset.h
 include/unicode/unistr.h
 include/unicode/unorm.h
 include/unicode/unorm2.h
 include/unicode/unum.h
 include/unicode/unumsys.h
 include/unicode/uobject.h
 include/unicode/upluralrules.h
 include/unicode/uregex.h
 include/unicode/uregion.h
-include/unicode/ureldatefmt.h
 include/unicode/urename.h
 include/unicode/urep.h
 include/unicode/ures.h
 include/unicode/uscript.h
 include/unicode/usearch.h
 include/unicode/uset.h
 include/unicode/usetiter.h
 include/unicode/ushape.h
 include/unicode/uspoof.h
 include/unicode/usprep.h
 include/unicode/ustdio.h
 include/unicode/ustream.h
 include/unicode/ustring.h
 include/unicode/ustringtrie.h
 include/unicode/utext.h
 include/unicode/utf.h
 include/unicode/utf16.h
 include/unicode/utf32.h
 include/unicode/utf8.h
 include/unicode/utf_old.h
 include/unicode/utmscale.h
 include/unicode/utrace.h
 include/unicode/utrans.h
 include/unicode/utypes.h
 include/unicode/uvernum.h
 include/unicode/uversion.h
 include/unicode/vtzone.h
 bin/uconv
 bin/pkgdata
 bin/makeconv
 bin/icuinfo
 bin/icu-config
 bin/genrb
 bin/gendict
 bin/gencnval
 bin/gencfu
 bin/genbrk
 bin/derb
 man/man1/derb.1.gz
 man/man1/genbrk.1.gz
 man/man1/gencfu.1.gz
 man/man1/gencnval.1.gz
 man/man1/gendict.1.gz
 man/man1/genrb.1.gz
 man/man1/icu-config.1.gz
 man/man1/makeconv.1.gz
 man/man1/pkgdata.1.gz
 man/man1/uconv.1.gz
 man/man8/genccode.8.gz
 man/man8/gencmn.8.gz
 man/man8/gensprep.8.gz
 man/man8/icupkg.8.gz
 %%DATADIR%%/%%ICUVER%%/mkinstalldirs
-%%DATADIR%%/%%ICUVER%%/LICENSE
+%%DATADIR%%/%%ICUVER%%/license.html
 %%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc