diff --git a/templates/tzdata-fix-build.diff b/templates/tzdata-fix-build.diff
new file mode 100644
index 00000000000..412a7650e2f
--- /dev/null
+++ b/templates/tzdata-fix-build.diff
@@ -0,0 +1,94 @@
+--- tzselect.ksh.orig	2009-01-14 23:35:17.000000000 +0100
++++ tzselect.ksh	2009-01-28 16:03:33.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /bin/ksh
++#! /bin/bash
+ 
+ VERSION='@(#)tzselect.ksh	8.2'
+ 
+--- Makefile.orig	2009-01-14 23:35:15.000000000 +0100
++++ Makefile	2009-01-28 16:04:04.000000000 +0100
+@@ -34,17 +34,17 @@ POSIXRULES=	America/New_York
+ 
+ # Everything gets put in subdirectories of. . .
+ 
+-TOPDIR=		/usr/local
++TOPDIR=		${DESTDIR}/usr
+ 
+ # "Compiled" time zone information is placed in the "TZDIR" directory
+ # (and subdirectories).
+ # Use an absolute path name for TZDIR unless you're just testing the software.
+ 
+-TZDIR=		$(TOPDIR)/etc/zoneinfo
++TZDIR=		$(TOPDIR)/share/zoneinfo
+ 
+ # The "tzselect", "zic", and "zdump" commands get installed in. . .
+ 
+-ETCDIR=		$(TOPDIR)/etc
++ETCDIR=		$(TOPDIR)/sbin
+ 
+ # If you "make INSTALL", the "date" command gets installed in. . .
+ 
+@@ -52,7 +52,7 @@ BINDIR=		$(TOPDIR)/bin
+ 
+ # Manual pages go in subdirectories of. . .
+ 
+-MANDIR=		$(TOPDIR)/man
++MANDIR=		$(TOPDIR)/share/man
+ 
+ # Library functions are put in an archive in LIBDIR.
+ 
+@@ -218,7 +218,7 @@ zic=		./zic
+ ZIC=		$(zic) $(ZFLAGS)
+ 
+ # The name of a Posix-compliant `awk' on your system.
+-AWK=		nawk
++AWK=		awk
+ 
+ # The path where SGML DTDs are kept.
+ SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
+@@ -285,9 +285,9 @@ install:	all $(DATA) $(REDO) $(TZLIB) $(
+ 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
+ 		cp iso3166.tab zone.tab $(TZDIR)/.
+-		-mkdir $(TOPDIR) $(ETCDIR)
++		-mkdir -p $(TOPDIR) $(ETCDIR)
+ 		cp tzselect zic zdump $(ETCDIR)/.
+-		-mkdir $(TOPDIR) $(MANDIR) \
++		-mkdir -p $(TOPDIR) $(MANDIR) \
+ 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
+ 		-rm -f $(MANDIR)/man3/newctime.3 \
+ 			$(MANDIR)/man3/newtzset.3 \
+@@ -300,9 +300,9 @@ install:	all $(DATA) $(REDO) $(TZLIB) $(
+ 		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
+ 
+ INSTALL:	ALL install date.1
+-		-mkdir $(TOPDIR) $(BINDIR)
++		-mkdir -p $(TOPDIR) $(BINDIR)
+ 		cp date $(BINDIR)/.
+-		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
++		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
+ 		-rm -f $(MANDIR)/man1/date.1
+ 		cp date.1 $(MANDIR)/man1/.
+ 
+@@ -332,9 +332,9 @@ right_only:	zic leapseconds $(TDATA)
+ # You must replace all of $(TZDIR) to switch from not using leap seconds
+ # to using them, or vice versa.
+ other_two:	zic leapseconds $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
++		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+-			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
++			-d $(TZDIR)/leaps -L leapseconds $(TDATA)
+ 
+ posix_right:	posix_only other_two
+ 
+@@ -343,7 +343,7 @@ right_posix:	right_only other_two
+ zones:		$(REDO)
+ 
+ $(TZLIB):	$(LIBOBJS)
+-		-mkdir $(TOPDIR) $(LIBDIR)
++		-mkdir -p $(TOPDIR) $(LIBDIR)
+ 		ar ru $@ $(LIBOBJS)
+ 		if [ -x /usr/ucb/ranlib -o -x /usr/bin/ranlib ] ; \
+ 			then ranlib $@ ; fi
diff --git a/templates/tzdata.tmpl b/templates/tzdata.tmpl
new file mode 100644
index 00000000000..121ee7a6a81
--- /dev/null
+++ b/templates/tzdata.tmpl
@@ -0,0 +1,21 @@
+pkgname=tzdata
+wrksrc=${pkgname}
+_dist_version=2009a
+version=0.${_dist_version}
+distfiles="
+ftp://elsie.nci.nih.gov/pub/${pkgname}${_dist_version}.tar.gz
+ftp://elsie.nci.nih.gov/pub/tzcode${_dist_version}.tar.gz"
+build_style=gnu_makefile
+make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
+short_desc="Time zone and daylight-saving time data"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum="
+c704d5a99f4e995b68e0463f206aad38dbddea7e9338d0ccc0abca901dd40100
+ead8d62a4b008078731bab34c149003eed23d1c47d43e35e19742b8fa4241f9b"
+long_desc="
+ This package contains data required for the implementation of standard
+ local time for many representative locations around the globe. It is
+ updated periodically to reflect changes made by political bodies to time
+ zone boundaries, UTC offsets, and daylight-saving rules."
+
+run_depends="glibc-2.8 bash-3.2 gawk-3.1.6"