diff --git a/.cvsignore b/.cvsignore
index 1c7f49e..8dea828 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 tzdata.tar.bz2
-tzdata2005f.tar.gz
+tzdata2005g.tar.gz
+tzcode2005g.tar.gz
diff --git a/sources b/sources
index 7e57200..0829fe6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 d20ffc3a857fd1714daadf8edacfb37a  tzdata.tar.bz2
-898be3e528225711dc2feff505938520  tzdata2005f.tar.gz
+f650791d4bcf37250c0723661619b1f6  tzdata2005g.tar.gz
+0319430cde95c3bad411b7dba6d35fbf  tzcode2005g.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index c6d4054..3568eb6 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,11 +1,12 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2005f
+Version: 2005g
 Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: %{name}.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz
+Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 Buildroot: /var/tmp/tzdata-root
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
@@ -19,6 +20,8 @@ the world.
 %setup -n tzdata
 mkdir %{name}%{version}
 tar xzf %{SOURCE1} -C %{name}%{version}
+mkdir tzcode%{version}
+tar xzf %{SOURCE2} -C tzcode%{version}
 
 %build
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
@@ -26,6 +29,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@install_root@|%{buildroot}|' \
   Makeconfig.in > Makeconfig
 make
+grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
 
 %install
 make install
@@ -39,8 +43,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
+%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Mar 17 2005 Jakub Jelinek <jakub@redhat.com> 2005g-2
+- 2005g
+  - fixes for Uruguay
+- include README and Theory from tzcode tarball in %{_docdir};
+  Theory includes a good summary of how the timezone data files
+  are supposed to be named
+
 * Tue Mar  1 2005 Jakub Jelinek <jakub@redhat.com> 2005f-2
 - 2005f
   - more updates for Israel, updates for Azerbaijan