diff --git a/.gitignore b/.gitignore
index 862625f..3f6d858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ tzdata2010l.tar.gz
 /tzdata2011b.tar.gz
 /tzcode2011b.tar.gz
 tzdata/
+/tzdata-*/
 *.rpm
 /tzdata2011d.tar.gz
 /tzcode2011d.tar.gz
@@ -78,3 +79,5 @@ noarch/
 /tzcode2012e.tar.gz
 /tzdata2012f.tar.gz
 /tzcode2012f.tar.gz
+/tzdata2012g.tar.gz
+/tzcode2012g.tar.gz
diff --git a/sources b/sources
index 6be152d..6eb3a99 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-944ad681a8623336230dcdb306d5c9f6  tzdata2012f.tar.gz
-edc0b55c4afbad7249ccacb3503e7f10  tzcode2012f.tar.gz
+111cd46b5c2e40b2b37ae707d48aaa50  tzdata2012g.tar.gz
+fe614c3cb5fd6418e2e65254aa46bb72  tzcode2012g.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index e90088d..3aed30b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,21 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012f
-%define tzdata_version 2012f
-%define tzcode_version 2012f
+Version: 2012g
+%define tzdata_version 2012g
+%define tzcode_version 2012g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
-
-# The tzdata-base-0.tar.bz2 is a simple building infrastructure and
-# a test suite.  It is occasionally updated from glibc sources, and as
-# such is under LGPLv2+, but none of this ever gets to be part of
-# final zoneinfo files.
-Source0: tzdata-base-0.tar.bz2
-# These are official upstream.
-Source1: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
-Source2: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
+Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 # __end
 
@@ -42,19 +35,10 @@ This package contains timezone information for use by Java runtimes.
 
 
 %prep
-%setup -q -n tzdata
-mkdir tzdata%{tzdata_version}
-tar xzf %{SOURCE1} -C tzdata%{tzdata_version}
-mkdir tzcode%{tzcode_version}
-tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
-sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-    -e 's|@datadir@|%{_datadir}|' \
-  Makeconfig.in > Makeconfig
-
-pushd tzdata%{tzdata_version}
+%setup -q -c -a 1
+
 # __apply_patches
 # __end
-popd
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -75,47 +59,55 @@ find . -type f -name '*.java' -print0 \
 popd
 
 %build
-make
-grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
+make TOPDIR=$RPM_BUILD_ROOT/usr \
+     TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
+     all
+grep -v tz-art.htm tz-link.htm > tz-link.html
 
 pushd javazic
 javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
 popd
-pushd tzdata%{tzdata_version}
-java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
-  -d ../zoneinfo/java \
+
+java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+  -d zoneinfo/java \
   africa antarctica asia australasia europe northamerica pacificnew \
   southamerica backward etcetera solar87 solar88 solar89 systemv \
-  ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
-popd
+  javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 
 %install
 rm -fr $RPM_BUILD_ROOT
-sed -i 's|@install_root@|%{buildroot}|' Makeconfig
-make install
-
+make TOPDIR=$RPM_BUILD_ROOT/usr \
+     TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
+     install
+mv $RPM_BUILD_ROOT/usr/share/zoneinfo-posix $RPM_BUILD_ROOT/usr/share/zoneinfo/posix
+mv $RPM_BUILD_ROOT/usr/share/zoneinfo-leaps $RPM_BUILD_ROOT/usr/share/zoneinfo/right
+rm -f $RPM_BUILD_ROOT/usr/share/zoneinfo/localtime
+rm -Rf $RPM_BUILD_ROOT/usr/{etc,lib,man}
 cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
 
-%check
-echo ====================TESTING=========================
-make check
-echo ====================TESTING END=====================
-
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
-%doc tzcode%{tzcode_version}/README
-%doc tzcode%{tzcode_version}/Theory
-%doc tzcode%{tzcode_version}/tz-link.html
+%doc README
+%doc Theory
+%doc tz-link.html
 
 %files java
 %defattr(-,root,root)
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 22 2012 Petr Machata <pmachata@redhat.com> - 2012g-1
+- Upstream 2012g
+  - Adjust the packaging for new Makefile
+  - Palestine: Fall transition was Sep 21, not Sep 28
+  - Samoa: Daylight Saving Time commences on Sunday 30th September
+    2012 and ends on Sunday 7th of April 2013.
+- Resolves: #868173
+
 * Mon Sep 17 2012 Petr Machata <pmachata@redhat.com> - 2012f-1
 - Fiji will start daylight savings at 2 am on Sunday 21st October 2012
   and end at 3 am on Sunday 20th January 2013.  Guess it will be like