diff --git a/timezone-java.changes b/timezone-java.changes
index a657a16..485b5a7 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 24 13:51:01 CET 2009 - schwab@suse.de
+
+- Don't copy directory into itself.
+
 -------------------------------------------------------------------
 Mon Feb 23 13:30:01 CET 2009 - dmueller@suse.de
 
diff --git a/timezone-java.spec b/timezone-java.spec
index f92b067..8020ccd 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -26,7 +26,7 @@ Group:          System/Base
 # COMMON-BEGIN
 # COMMON-BEGIN
 Version:        2009b
-Release:        2
+Release:        3
 Source:         tzdata%{version}.tar.gz
 %define tzcode_version 2009b
 Source1:        tzcode%{tzcode_version}.tar.gz
@@ -64,6 +64,8 @@ cp -a javazi $RPM_BUILD_ROOT%{_datadir}
 %{_datadir}/javazi
 
 %changelog
+* Tue Feb 24 2009 schwab@suse.de
+- Don't copy directory into itself.
 * Mon Feb 23 2009 dmueller@suse.de
 - update to 2009b:
   * leapseconds: updated to reflect no mid-2009 leap second
diff --git a/timezone.changes b/timezone.changes
index a657a16..485b5a7 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 24 13:51:01 CET 2009 - schwab@suse.de
+
+- Don't copy directory into itself.
+
 -------------------------------------------------------------------
 Mon Feb 23 13:30:01 CET 2009 - dmueller@suse.de
 
diff --git a/timezone.spec b/timezone.spec
index 09ea2c8..501f306 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -26,7 +26,7 @@ Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 # COMMON-BEGIN
 Version:        2009b
-Release:        2
+Release:        3
 Source:         tzdata%{version}.tar.gz
 %define tzcode_version 2009b
 Source1:        tzcode%{tzcode_version}.tar.gz
@@ -55,19 +55,18 @@ make TZDIR=zoneinfo AWK=awk zones
 ./zic -y ./yearistype -d zoneinfo -p America/New_York
 
 %install
-rm -rf zoneinfo-posix
-cp -al zoneinfo zoneinfo/posix || :
-mv zoneinfo-leaps zoneinfo/right
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share
-cp -a zoneinfo $RPM_BUILD_ROOT/%{_prefix}/share
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo
+cp -a zoneinfo $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/posix
+cp -al $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/posix/. $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo
+cp -a zoneinfo-leaps $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/right
 mkdir -p $RPM_BUILD_ROOT/etc
 rm -f $RPM_BUILD_ROOT/etc/localtime
-cp -f $RPM_BUILD_ROOT/%{_prefix}/share/zoneinfo/UTC $RPM_BUILD_ROOT/etc/localtime
-install -m 644 iso3166.tab $RPM_BUILD_ROOT/%{_prefix}/share/zoneinfo/iso3166.tab
-install -m 644 zone.tab $RPM_BUILD_ROOT/%{_prefix}/share/zoneinfo/zone.tab
-install -D -m 755 tzselect $RPM_BUILD_ROOT/%{_bindir}/tzselect
-install -D -m 755 zdump $RPM_BUILD_ROOT/%{_sbindir}/zdump
-install -D -m 755 zic $RPM_BUILD_ROOT/%{_sbindir}/zic
+cp -f $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/UTC $RPM_BUILD_ROOT/etc/localtime
+install -m 644 iso3166.tab $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/iso3166.tab
+install -m 644 zone.tab $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/zone.tab
+install -D -m 755 tzselect $RPM_BUILD_ROOT%{_bindir}/tzselect
+install -D -m 755 zdump $RPM_BUILD_ROOT%{_sbindir}/zdump
+install -D -m 755 zic $RPM_BUILD_ROOT%{_sbindir}/zic
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,6 +92,8 @@ fi
 %{_sbindir}/zic
 
 %changelog
+* Tue Feb 24 2009 schwab@suse.de
+- Don't copy directory into itself.
 * Mon Feb 23 2009 dmueller@suse.de
 - update to 2009b:
   * leapseconds: updated to reflect no mid-2009 leap second