diff --git a/.gitignore b/.gitignore
index 40cf432..e60390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ tzdata/
 noarch/
 .build-*
 /tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
diff --git a/sources b/sources
index 4d14f09..b7418fb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
+cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011h-kemerovo.patch
deleted file mode 100644
index ff6da57..0000000
--- a/tzdata-2011h-kemerovo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
-@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
- 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
- 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
- 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
--			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
--			 7:00	-	NOVT # Novosibirsk/Novokuznetsk Time
-+			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
-+			 7:00	-	OMST # Novosibirsk/Novokuznetsk Time
- 
- #
- # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-
-Diff finished.  Mon Jun 27 16:49:45 2011
diff --git a/tzdata-2011i-kemerovo.patch b/tzdata-2011i-kemerovo.patch
new file mode 100644
index 0000000..ef52390
--- /dev/null
+++ b/tzdata-2011i-kemerovo.patch
@@ -0,0 +1,16 @@
+diff -up tzdata2011h/europe\~ tzdata2011h/europe
+--- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
+@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
+ 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+ 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+ 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
+-			 7:00	-	NOVT # Novosibirsk/Novokuznetsk Time
++			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
++			 7:00	-	OMST # Novosibirsk/Novokuznetsk Time
+ 
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished.  Mon Jun 27 16:49:45 2011
diff --git a/tzdata.spec b/tzdata.spec
index cea04fe..22562d3 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011h
-%define tzcode_version 2011g
-Release: 2%{?dist}
+%define tzdata_version 2011i
+%define tzcode_version 2011i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011h-kemerovo.patch
-Patch2: tzdata-2011h-labrador.patch
+Patch1: tzdata-2011i-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 29 2011 Petr Machata <pmachata@redhat.com> - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
 * Wed Aug 10 2011 Petr Machata <pmachata@redhat.com> - 2011h-2
 - Patch for upcoming change in Newfoundland.  The transition time
   changes from 12:01 AM to 2:00 AM.