diff --git a/packages/sysutils/timezone-data/package.mk b/packages/sysutils/tz/package.mk
similarity index 73%
rename from packages/sysutils/timezone-data/package.mk
rename to packages/sysutils/tz/package.mk
index 363b784402..4eb666003e 100644
--- a/packages/sysutils/timezone-data/package.mk
+++ b/packages/sysutils/tz/package.mk
@@ -16,39 +16,32 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="timezone-data"
-PKG_VERSION="2016a"
+PKG_NAME="tz"
+PKG_VERSION="2016i"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Public Domain"
 PKG_SITE="http://www.iana.org/time-zones"
-# this package actually contains both packages tzcode and tzdate in a single package
-# duplicate files are the same files
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/eggert/tz/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="system"
-PKG_SHORTDESC="timezone-data"
-PKG_LONGDESC="timezone-data"
+PKG_SHORTDESC="tzdata"
+PKG_LONGDESC="tzdata"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
-  setup_toolchain host
-  make CC="$HOST_CC" CFLAGS="$HOST_CFLAGS"
-}
+PKG_MAKE_OPTS_TARGET="CC=$HOST_CC LDFLAGS="
 
 makeinstall_target() {
-  make TOPDIR="./.install_pkg" install
+  make TOPDIR="$INSTALL" install
 }
 
 post_makeinstall_target() {
   mkdir -p $INSTALL/usr/share/zoneinfo
-    mv $INSTALL/etc/zoneinfo/* $INSTALL/usr/share/zoneinfo
+  mv $INSTALL/etc/zoneinfo/* $INSTALL/usr/share/zoneinfo
 
-  rm -rf $INSTALL/man
   rm -rf $INSTALL/etc
-
   mkdir -p $INSTALL/etc
     ln -sf /var/run/localtime $INSTALL/etc/localtime
 }
diff --git a/packages/sysutils/timezone-data/system.d/tz-data.service b/packages/sysutils/tz/system.d/tz-data.service
similarity index 100%
rename from packages/sysutils/timezone-data/system.d/tz-data.service
rename to packages/sysutils/tz/system.d/tz-data.service
diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk
index 5cb9ab07a4..10118e3964 100644
--- a/packages/virtual/libc/package.mk
+++ b/packages/virtual/libc/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain glibc timezone-data"
+PKG_DEPENDS_TARGET="toolchain glibc tz"
 PKG_DEPENDS_INIT="toolchain glibc:init"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="libc: Metapackage"