diff --git a/packages/sysutils/timezone-data/build b/packages/sysutils/timezone-data/build
index b3f7d344a7..dba8b0bc9c 100755
--- a/packages/sysutils/timezone-data/build
+++ b/packages/sysutils/timezone-data/build
@@ -25,6 +25,19 @@
 setup_toolchain host
 
 cd $PKG_BUILD
+TIMEZONES="africa \
+  antarctica \
+  asia \
+  australasia \
+  europe \
+  northamerica \
+  southamerica \
+  etcetera \
+  factory \
+  backward \
+  systemv \
+  pacificnew"
 
-make CC="$HOST_CC" CFLAGS="$HOST_CFLAGS"
-make TOPDIR="./.install" install
+for zone in $TIMEZONES ; do
+  zic -d ./zoneinfo -L /dev/null -y yearistype.sh $zone
+done
diff --git a/packages/sysutils/timezone-data/init.d/03_timezone b/packages/sysutils/timezone-data/init.d/03_timezone
new file mode 100644
index 0000000000..04e49890c0
--- /dev/null
+++ b/packages/sysutils/timezone-data/init.d/03_timezone
@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+#
+# make variable directory structure
+#
+# runlevels: openelec, installer, textmode
+
+progress "setting timezone"
+  GUISETTINGS="/storage/.xbmc/userdata/guisettings.xml"
+  if [ -f "$GUISETTINGS" ] ; then
+    TIMEZONE=`sed -n -e 's/.*<timezone>\(.*\)<\/timezone>.*/\1/p' /storage/.xbmc/userdata/guisettings.xml`
+  fi
+
+  if [ ! "$TIMEZONE" == "" -a -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then
+    ln -sf "/usr/share/zoneinfo/$TIMEZONE" /var/run/localtime
+  fi
diff --git a/packages/sysutils/timezone-data/install b/packages/sysutils/timezone-data/install
index d12c73c4a1..5266343eab 100755
--- a/packages/sysutils/timezone-data/install
+++ b/packages/sysutils/timezone-data/install
@@ -23,4 +23,7 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/share/zoneinfo
-  cp -R $PKG_BUILD/.install/etc/zoneinfo/* $INSTALL/usr/share/zoneinfo
+  cp -R $PKG_BUILD/zoneinfo/* $INSTALL/usr/share/zoneinfo
+
+mkdir -p $INSTALL/etc
+  ln -sf /var/run/localtime $INSTALL/etc/localtime
diff --git a/packages/sysutils/timezone-data/meta b/packages/sysutils/timezone-data/meta
index 31fa3447ff..53f0bb2166 100644
--- a/packages/sysutils/timezone-data/meta
+++ b/packages/sysutils/timezone-data/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="timezone-data"
-PKG_VERSION="2011n"
+PKG_VERSION="2012b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Public Domain"
-PKG_SITE="ftp://elsie.nci.nih.gov/pub/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_SITE="http://www.iana.org"
+PKG_URL="http://www.iana.org/time-zones/repository/releases/tzdata${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/sysutils/timezone-data/unpack b/packages/sysutils/timezone-data/unpack
new file mode 100644
index 0000000000..3f69c9cda4
--- /dev/null
+++ b/packages/sysutils/timezone-data/unpack
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+[ -d $BUILD/$PKG_NAME-$PKG_VERSION ] && rm -rf $BUILD/$PKG_NAME-$PKG_VERSION
+
+mkdir $BUILD/$PKG_NAME-$PKG_VERSION
+tar -xzf $SOURCES/$PKG_NAME/tzdata${PKG_VERSION}.tar.gz -C $BUILD/${PKG_NAME}-${PKG_VERSION}