--- a/components/timezone/Makefile	Thu Oct 01 13:23:24 2015 -0700
+++ b/components/timezone/Makefile	Tue Oct 13 09:18:46 2015 -0700
@@ -33,6 +33,14 @@
 
 TPNO=			24066
 
+# Build info part of pkg(5) FMRI dropped ",$(OS_VERSION)" between 11 and 12;
+# needed for evaluation repo where we build the default repo from 12 on 11.
+ifeq ($(OS_VERSION),5.11)
+OS_META_VERSION=	,$(OS_VERSION)-$(OS_VERSION)
+else
+OS_META_VERSION=	-$(OS_VERSION)
+endif
+
 # "etcetera" must be listed before "backward" because it sets up links that
 # "backward" needs.
 TZFILES= africa antarctica asia australasia etcetera europe \
@@ -42,6 +50,8 @@
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+PKG_MACROS +=		OS_META_VERSION=$(OS_META_VERSION)
+
 POFILE=zoneinfo.po
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)