Index: head/etc/mtree/BSD.usr.dist
===================================================================
--- head/etc/mtree/BSD.usr.dist
+++ head/etc/mtree/BSD.usr.dist
@@ -1253,15 +1253,25 @@
             ..
             Australia
             ..
+            Brazil
+            ..
+            Canada
+            ..
+            Chile
+            ..
             Etc
             ..
             Europe
             ..
             Indian
             ..
+            Mexico
+            ..
             Pacific
             ..
             SystemV
+            ..
+            US
             ..
         ..
     ..
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -218,7 +218,6 @@
     SORT_THREADS \
     SVN \
     ZONEINFO_LEAPSECONDS_SUPPORT \
-    ZONEINFO_OLD_TIMEZONES_SUPPORT \
 
 # LEFT/RIGHT. Left options which default to "yes" unless their corresponding
 # RIGHT option is disabled.
@@ -466,7 +465,6 @@
 
 .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
@@ -40,11 +40,6 @@
 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
@@ -53,12 +48,9 @@
 
 TZFILES=	africa antarctica asia australasia etcetera europe \
 		factory northamerica southamerica
+TZFILES+=	backward systemv
 POSIXRULES=	America/New_York
 
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
-TZFILES+=	backward systemv
-.endif
-
 TZFILES:=	${TZFILES:S/^/${CONTRIBDIR}/}
 
 TZBUILDDIR=	${.OBJDIR}/builddir
@@ -78,10 +70,7 @@
 		Indian \
 		Pacific \
 		SystemV
-
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
-.endif
 
 .if !defined(_SKIP_BUILD)
 all: zoneinfo
Index: head/share/zoneinfo/tests/Makefile
===================================================================
--- head/share/zoneinfo/tests/Makefile
+++ head/share/zoneinfo/tests/Makefile
@@ -8,10 +8,8 @@
 
 FILESGROUPS+=	TESTFILES
 
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
 ATF_TESTS_SH+=	backward_test
 TESTFILES+=	backward
-.endif
 
 TESTFILES+=	zoneinfo_common.sh
 TESTFILESPACKAGE= ${PACKAGE}