diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile
index d5d7763a873..d4a080d9494 100644
--- a/mail/mozilla-thunderbird/Makefile
+++ b/mail/mozilla-thunderbird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.234 2017/01/26 08:42:00 landry Exp $
+# $OpenBSD: Makefile,v 1.235 2017/02/05 19:50:51 landry Exp $
 
 COMMENT-main =		Mozilla e-mail, rss and usenet client
 COMMENT-lightning =	Mozilla Thunderbird calendar extension
@@ -10,6 +10,7 @@ MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	thunderbird
 MOZILLA_CODENAME =	mail
 EXTRACT_SUFX =		.tar.xz
+REVISION-main=	0
 
 MULTI_PACKAGES =	-main -lightning
 PKGNAME-main =		${PKGNAME}
@@ -66,6 +67,14 @@ CONFIGURE_ARGS +=	--disable-gstreamer
 CONFIGURE_ARGS +=       --disable-debug-symbols
 .endif
 
+# bug #1064665
+LIB_DEPENDS +=	textproc/icu4c
+CONFIGURE_ARGS += --with-system-icu
+WANTLIB += icudata icui18n icuuc
+
+# bug 857628
+CONFIGURE_ARGS +=	--enable-pie
+
 ALL_TARGET =	default
 
 GNU_ARCH =	${MACHINE_ARCH:S/amd64/x86_64/}