diff --git a/sources b/sources
index 6998380..63c5730 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-329c3ff06919193c55a293a73a8c618f  tzcode2009e.tar.gz
-ff432bff80111f4bb998be5d4fd6260d  tzdata2009f.tar.gz
+5c74f0acf58617728aa30f7777e605e0  tzdata2009i.tar.gz
+5708cf87bd6e55d7132d4faab40bcfcf  tzcode2009i.tar.gz
diff --git a/tzdata-2009e-cairo.patch b/tzdata-2009e-cairo.patch
deleted file mode 100644
index ee86ed9..0000000
--- a/tzdata-2009e-cairo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tzdata2009e/africa tzdata2009e-pm/africa
---- tzdata2009f/africa	2009-03-23 14:37:51.000000000 +0100
-+++ tzdata2009f-pm/africa	2009-04-06 16:06:49.000000000 +0200
-@@ -236,7 +236,8 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
- # unless discontinued, next DST may end Thursday 28 August 2008.
- # From Paul Eggert (2007-08-17):
- # For lack of better info, assume the new rule is last Thursday in August.
--Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
-+Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-+Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
- 
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
-
-Diff finished.  Mon Apr  6 16:06:53 2009
diff --git a/tzdata.spec b/tzdata.spec
index d93da40..63a1876 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009f
+Version: 2009i
 %define tzdata_version %{version}
-%define tzcode_version 2009e
+%define tzcode_version %{version}
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
-Patch1: tzdata-2009e-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Jun  8 2009 Petr Machata <pmachata@redhat.com> - 2009i-1
+- Upstream 2009i
+  - Bangladesh introduces DST 2009-06-20
+- Upstream 2009h
+  - Convert use of 00:00 stamps to 24:00 of the previous day
+  - Clarify that the data is Public Domain
+- Drop Cairo patch
+
 * Mon Apr 13 2009 Petr Machata <pmachata@redhat.com> - 2009f-1
 - Upstream 2009f
   - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01