diff --git a/timezone-java.changes b/timezone-java.changes
index 273cb20..f8985cb 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon Jun 27 14:18:10 CEST 2011 - dmueller@suse.de
 
-- update to 2011h:
+- update to 2011h (bnc#684181):
   * Russia is abolishing daylight saving time.
   * iso3166 code for America/Curacao changed from AN to CW
 
diff --git a/timezone-java.spec b/timezone-java.spec
index 1b2ec8e..3e8500e 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package timezone-java
+# spec file for package timezone-java (Version 2008h)
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,10 +25,10 @@ Summary:        Timezone Descriptions
 Group:          System/Base
 # COMMON-BEGIN
 # COMMON-BEGIN
-Version:        2011h
+Version:        2011i
 Release:        1
-Source:         tzdata%{version}.tar.gz
-Source1:        tzcode2011g.tar.gz
+Source:         ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
+Source1:        ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 # COMMON-END
 # COMMON-END
 Url:            http://www.gnu.org/software/libc/libc.html
@@ -63,3 +63,6 @@ cp -a javazi $RPM_BUILD_ROOT%{_datadir}
 %{_datadir}/javazi
 
 %changelog
+* Mon Sep 29 2008 mvyskocil@suse.cz
+- Moved the timezone-java to separate specfile (adrian's request for better
+  bootstrapping of SUSE)
diff --git a/timezone.changes b/timezone.changes
index 273cb20..eb3dcfd 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,7 +1,21 @@
+-------------------------------------------------------------------
+Sun Sep  4 20:58:22 UTC 2011 - dmueller@suse.de
+
+- update to 2011i:
+  * Add Africa/Juba (South Sudan) zone
+  * Samoa skips over 2011-12-30
+  * Use KALT as abbreviation for Europe/Kalinigrad from spring
+    2011 forward
+  * Newfoundland changes time of day for DST start and end
+    to 2:00 a.m. starting fall 2011 and forward
+  * Change America/Resolute use of EST to 2006-2007 only
+  * iso3166.tab Add SS (South Sudan) entry.
+  * zone.tab Change America/Resolute entry to Central Standard Time.
+
 -------------------------------------------------------------------
 Mon Jun 27 14:18:10 CEST 2011 - dmueller@suse.de
 
-- update to 2011h:
+- update to 2011h (bnc#684181):
   * Russia is abolishing daylight saving time.
   * iso3166 code for America/Curacao changed from AN to CW
 
diff --git a/timezone.spec b/timezone.spec
index f6e9fc5..cac3063 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -25,10 +25,10 @@ Group:          System/Base
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 # COMMON-BEGIN
-Version:        2011h
+Version:        2011i
 Release:        1
-Source:         tzdata%{version}.tar.gz
-Source1:        tzcode2011g.tar.gz
+Source:         ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
+Source1:        ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 # COMMON-END
 Patch0:         tzdata-china.diff
 Patch1:         tzcode-zic.diff
diff --git a/tzcode2011g.tar.gz b/tzcode2011g.tar.gz
deleted file mode 100644
index c98e3fd..0000000
--- a/tzcode2011g.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:636c735d8df1276cc8ab88bc31bb36a21f91ed34e26d181303ecd8fe48021bc2
-size 194929
diff --git a/tzcode2011i.tar.gz b/tzcode2011i.tar.gz
new file mode 100644
index 0000000..87b292f
--- /dev/null
+++ b/tzcode2011i.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec
+size 135022
diff --git a/tzdata2011h.tar.gz b/tzdata2011h.tar.gz
deleted file mode 100644
index 55e3ad1..0000000
--- a/tzdata2011h.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c098786d053736dd18d4f1fbebdf41554c6fd702a36f75c18f1c66712d2abc24
-size 196441
diff --git a/tzdata2011i.tar.gz b/tzdata2011i.tar.gz
new file mode 100644
index 0000000..7423380
--- /dev/null
+++ b/tzdata2011i.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8dde7ca5e61f21ac34c8cdbef5568d00c829981211098f059d8104964c81ffa
+size 198665