diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -78,11 +78,16 @@
 .endif
 META_TARGETS+=	zoneinfo install-zoneinfo
 
+ZICFLAGS?=	-p ${POSIXRULES}
+.if ${MACHINE_ARCH} == "amd64"
+ZICFLAGS+=	-b fat
+.endif
+
 zoneinfo: ${TDATA}
 	mkdir -p ${TZBUILDDIR}
 	cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}
 	umask 022; cd ${.CURDIR}; \
-	zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
+	zic -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \
 	    ${LEAPFILE} ${TZFILES}
 
 #