diff --git a/timezone.changes b/timezone.changes
index 84bd6bf..085ac83 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Sep 10 09:35:18 CEST 2008 - mvyskocil@suse.cz
+
+- Remove a rht renaming hack, because is not necessary in SUSE's build system
+  and move the javazic to a new package
+- Use a gcc-gij as a default java implementation
+- Use a %setup macro instead of tar -xf
+- Use javazi as a destination directory for java zone info files.
+
+-------------------------------------------------------------------
+Fri Sep  5 10:18:38 CEST 2008 - mvyskocil@suse.cz
+
+- Add new java subpackage (necessary for openjdk) 
+
 -------------------------------------------------------------------
 Tue Jun  3 15:04:02 CEST 2008 - pbaudis@suse.cz
 
diff --git a/timezone.spec b/timezone.spec
index 4b7aa73..09afb01 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -2,9 +2,16 @@
 # spec file for package timezone (Version 2008c)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -12,13 +19,14 @@
 
 
 Name:           timezone
+BuildRequires:  fastjar gcc-gij javazic
 License:        Public Domain, Freeware
 Summary:        Timezone Descriptions
 Group:          System/Base
 AutoReqProv:    on
 # tzcode-2008c is identical with tzcode-2008a
 Version:        2008c
-Release:        1
+Release:        28
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -34,6 +42,18 @@ can select an appropriate time zone for your system with YaST.
 
 
 
+%package java
+License:        Public Domain, Freeware
+Summary:        Timezone Descriptions
+Group:          System/Base
+Provides:       tzdata-java = %{version}-%{release}
+
+%description java
+These are configuration files that describe available time zones. You
+can select an appropriate time zone for your system with YaST.
+
+
+
 %prep
 %setup -c -a 1
 %patch
@@ -45,6 +65,12 @@ make TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DT
 make TZDIR=zoneinfo AWK=awk zones
 # Generate posixrules
 ./zic -y ./yearistype -d zoneinfo -p America/New_York
+gij -jar %{_javadir}/javazic.jar -V %{version} \
+    -d javazi \
+    africa antarctica asia australasia europe northamerica pacificnew \
+    southamerica backward etcetera solar87 solar88 solar89 systemv  \
+    %{_datadir}/javazic/tzdata_jdk/gmt \
+    %{_datadir}/javazic/tzdata_jdk/jdk11_backward
 
 %install
 rm -rf zoneinfo-posix
@@ -60,6 +86,7 @@ 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 -a javazi $RPM_BUILD_ROOT%{_datadir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +111,19 @@ fi
 %{_sbindir}/zdump
 %{_sbindir}/zic
 
+%files java
+%defattr(-,root,root)
+%{_datadir}/javazi
+
 %changelog
+* Wed Sep 10 2008 mvyskocil@suse.cz
+- Remove a rht renaming hack, because is not necessary in SUSE's build system
+  and move the javazic to a new package
+- Use a gcc-gij as a default java implementation
+- Use a %%setup macro instead of tar -xf
+- Use javazi as a destination directory for java zone info files.
+* Fri Sep 05 2008 mvyskocil@suse.cz
+- Add new java subpackage (necessary for openjdk)
 * Tue Jun 03 2008 pbaudis@suse.cz
 - Update to version 2008c (Marocco, Mongolia, Pakistan DST changes)
   [bnc#396308]