diff --git a/.cvsignore b/.cvsignore
index 75a117b..68a7bdb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,4 @@ tzdata2008c.tar.gz
 tzdata2008d.tar.gz
 tzdata2008e.tar.gz
 tzcode2008e.tar.gz
+tzdata2008f.tar.gz
diff --git a/sources b/sources
index f5d46c8..bd99bcb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-3b4578110a3d193ed9a00d61f27aba28  tzdata2008e.tar.gz
 12ec2d85324ddcba39db1471a03f486b  tzcode2008e.tar.gz
+aa3b077a7b786d46c131303b1d75deee  tzdata2008f.tar.gz
diff --git a/tzdata-2008e-pakistan+morocco.patch b/tzdata-2008e-pakistan+morocco.patch
deleted file mode 100644
index caa0c15..0000000
--- a/tzdata-2008e-pakistan+morocco.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urp tzdata/tzdata2008e/africa tzdata-2008e/tzdata2008e/africa
---- tzdata/tzdata2008e/africa	2008-07-20 21:47:07.000000000 +0200
-+++ tzdata-2008e/tzdata2008e/africa	2008-08-28 13:17:44.000000000 +0200
-@@ -542,7 +542,7 @@ Rule	Morocco	1977	only	-	Sep	28	 0:00	0	
- Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
- Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
- Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
--Rule	Morocco	2008	only	-	Sep	28	 0:00	0	-
-+Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
- 			 0:00	Morocco	WE%sT	1984 Mar 16
-Only in tzdata-2008e/tzdata2008e/: africa~
-diff -urp tzdata/tzdata2008e/asia tzdata-2008e/tzdata2008e/asia
---- tzdata/tzdata2008e/asia	2008-07-20 21:09:44.000000000 +0200
-+++ tzdata-2008e/tzdata2008e/asia	2008-08-28 13:17:44.000000000 +0200
-@@ -1545,7 +1545,7 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
- Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
- Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
- Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
--Rule Pakistan	2008	only	-	Sep	1	0:00	0	-
-+Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Karachi	4:28:12 -	LMT	1907
- 			5:30	-	IST	1942 Sep
-Only in tzdata-2008e/tzdata2008e/: asia~
diff --git a/tzdata-casablanca.patch b/tzdata-casablanca.patch
deleted file mode 100644
index 798a2a0..0000000
--- a/tzdata-casablanca.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urp tzdata/tzdata2008b/africa tzdata-pm/tzdata2008b/africa
---- tzdata/tzdata2008b/africa	2008-03-24 13:30:58.000000000 +0100
-+++ tzdata-pm/tzdata2008b/africa	2008-05-26 13:38:43.000000000 +0200
-@@ -416,11 +416,13 @@ Rule	Morocco	1976	only	-	Aug	 1	 0:00	0	
- Rule	Morocco	1977	only	-	Sep	28	 0:00	0	-
- Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
- Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
-+Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
-+Rule	Morocco	2008	only	-	Sep	28	 0:00	0	-
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
- 			 0:00	Morocco	WE%sT	1984 Mar 16
- 			 1:00	-	CET	1986
--			 0:00	-	WET
-+ 			 0:00	Morocco	WE%sT
- # Western Sahara
- Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
- 			-1:00	-	WAT	1976 Apr 14
-Only in tzdata-pm/tzdata2008b: africa~
diff --git a/tzdata-karachi.patch b/tzdata-karachi.patch
deleted file mode 100644
index 409ee4b..0000000
--- a/tzdata-karachi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp tzdata/tzdata2008b/asia tzdata-pm/tzdata2008b/asia
---- tzdata/tzdata2008b/asia	2008-03-24 13:30:58.000000000 +0100
-+++ tzdata-pm/tzdata2008b/asia	2008-05-19 13:00:50.000000000 +0200
-@@ -1465,6 +1465,8 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
- Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
-+Rule Pakistan   2008    only    -       Jun     1       0:01    1:00    S
-+Rule Pakistan   2008    only    -       Aug     31      0:01    0       -
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Karachi	4:28:12 -	LMT	1907
- 			5:30	-	IST	1942 Sep
diff --git a/tzdata.spec b/tzdata.spec
index 1a7a7ad..307a95b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008e
+Version: 2008f
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 2%{?dist}
+%define tzcode_version 2008e
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -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-2008e-pakistan+morocco.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 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 16 2008 Petr Machata <pmachata@redhat.com> - 2008f-1
+- Upstream 2008f
+  - Changes for Mauritius (extends DST to years to come)
+  - Palestine changes clocks for the duration of Ramadan
+  - Argentina will start DST on Sunday October 19, 2008
+  - Brazil will start DST on 2008-10-19
+- Drop Pakistan and Morocco patches
+
 * Thu Aug 28 2008 Petr Machata <pmachata@redhat.com> - 2008e-2
 - Pakistan DST is scheduled until Oct/31
 - Morocco DST is scheduled until Aug/31