diff --git a/.cvsignore b/.cvsignore
index 54be37f..d741dfb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 tzdata.tar.bz2
-tzcode2005q.tar.gz
-tzdata2005q.tar.gz
+tzdata2005r.tar.gz
+tzcode2005r.tar.gz
diff --git a/sources b/sources
index e4c8d8c..4dd9947 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 325dba39b9741b63b94e4c05a3fefd5c  tzdata.tar.bz2
-1177f3301dad001c337ebfcb68f7a8dc  tzcode2005q.tar.gz
-63551b3b24d37340cdc92d26c6c38195  tzdata2005q.tar.gz
+b692c04a6a41080e214add0d3f58c700  tzdata2005r.tar.gz
+063ea36d9257eb6779b1df847b04d8ab  tzcode2005r.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index b17a582..931a461 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2005q
+Version: 2005r
 Release: 2
 License: GPL
 Group: System Environment/Base
@@ -46,6 +46,18 @@ rm -rf %{buildroot}
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Jan  5 2006 Petr Machata <pmachata@redhat.com> 2005r-2
+- 2005r
+  - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to
+    northamerica to guard against old files with obsolete information
+    being left in the time zone binary directory.
+  - Changes for countries that are supposed to join 2007 US DST
+    change.  This includes most of Canada, however entries already in
+    the database (Alberta, British Columbia, Newfoundland, Northwest
+    Territories, and Yukon) were left alone for the time being.
+  - Fixes in zdump.c (abbrok): conditions are chained, and the string
+    is checked for emptiness.
+
 * Sat Dec 17 2005 Jakub Jelinek <jakub@redhat.com> 2005q-2
 - 2005q
   - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua