Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -190,6 +190,8 @@
     SHARED_TOOLCHAIN \
     SORT_THREADS \
     SVN \
+    ZONEINFO_LEAPSECONDS_SUPPORT \
+    ZONEINFO_OLD_TIMEZONES_SUPPORT \
 
 
 #
@@ -385,6 +387,11 @@
 
 .if ${MK_TESTS} == "no"
 MK_DTRACE_TESTS:= no
+.endif
+
+.if ${MK_ZONEINFO} == "no"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
 .endif
 
 .if ${MK_CROSS_COMPILER} == "no"
Index: head/share/zoneinfo/Makefile
===================================================================
--- head/share/zoneinfo/Makefile
+++ head/share/zoneinfo/Makefile
@@ -28,12 +28,24 @@
 # $ svn commit	# Commit message: "MFV of tzdata2008X"
 #
 
+.include <src.opts.mk>
+
 CLEANFILES+=	yearistype
 CLEANDIRS+=	builddir
 CONTRIBDIR=	${SRCTOP}/contrib/tzdata/
 .PATH:		${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
+.warning "Using backwards compatibility variable for LEAPSECONDS; please use WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
+.endif
+
+.if defined(OLDTIMEZONES)
+.warning "Using backwards compatibility variable for OLDTIMEZONES; please use WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead"
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes
+.endif
+
+.if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no"
 LEAPFILE=	-L ${CONTRIBDIR}leapseconds
 .else
 LEAPFILE=
@@ -43,7 +55,7 @@
 		factory northamerica southamerica
 POSIXRULES=	America/New_York
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZFILES+=	backward systemv
 .endif
 
@@ -67,7 +79,7 @@
 		Pacific \
 		SystemV
 
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
 .endif
 
Index: head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
===================================================================
--- head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
+++ head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build leapsecond information in to the timezone database.
Index: head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
===================================================================
--- head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
+++ head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to build backward compatibility timezone aliases in to the timezone
+database.