diff --git a/timezone-java.changes b/timezone-java.changes
index 683fb81..e7b7ae1 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov 20 16:19:01 UTC 2014 - fstrba@suse.com
+
+- make timezone-java compatible with Java8
+  * Add generation of tzdb.dat used by Java8 and Java9
+  * Require tzdb package to be able to generate this database
+  * Build using java-bootstrap 1.7 used in openSUSE:Factory to
+    bootstrap java-1_7_0-openjdk
+  * Add virtual provider tzdata-java8 in order to be able to
+    require it for java-1_8_0-openjdk
+
 -------------------------------------------------------------------
 Tue Nov 11 18:36:37 UTC 2014 - andreas.stieger@gmx.de
 
diff --git a/timezone-java.spec b/timezone-java.spec
index 31ffa8f..9683622 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -17,9 +17,9 @@
 
 
 Name:           timezone-java
-BuildRequires:  fastjar
-BuildRequires:  gcc-gij
+BuildRequires:  java-bootstrap
 BuildRequires:  javazic
+BuildRequires:  tzdb
 Summary:        Time Zone Descriptions
 License:        BSD-3-Clause and SUSE-Public-Domain
 Group:          System/Base
@@ -46,6 +46,7 @@ Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 BuildArch:      noarch
 Provides:       tzdata-java = %{version}-%{release}
+Provides:       tzdata-java8 = %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -71,13 +72,23 @@ sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
 # COMMON-PREP-END
 # COMMON-PREP-END
 
+echo "tzdata%{version}" >> VERSION
+
 %build
-gij -jar %{_javadir}/javazic.jar -V %{version} \
-    -d javazi \
-    africa antarctica asia australasia europe northamerica pacificnew \
-    southamerica backward etcetera systemv  \
-    %{_datadir}/javazic/tzdata_jdk/gmt \
-    %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 6/7 data
+java -jar %{_javadir}/javazic.jar -V %{version} \
+     -d javazi \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/javazic/tzdata_jdk/gmt \
+     %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 8/9 data
+java -jar %{_javadir}/tzdb.jar \
+     -srcdir . -dstfile javazi/tzdb.dat \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/tzdb/tzdata_jdk/gmt \
+     %{_datadir}/tzdb/tzdata_jdk/jdk11_backward
 
 %install
 install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
diff --git a/timezone-java.spec.in b/timezone-java.spec.in
index 2e3b0cd..62a7472 100644
--- a/timezone-java.spec.in
+++ b/timezone-java.spec.in
@@ -17,9 +17,9 @@
 
 
 Name:           timezone-java
-BuildRequires:  fastjar
-BuildRequires:  gcc-gij
+BuildRequires:  java-bootstrap
 BuildRequires:  javazic
+BuildRequires:  tzdb
 Summary:        Time Zone Descriptions
 License:        BSD-3-Clause and SUSE-Public-Domain
 Group:          System/Base
@@ -29,6 +29,7 @@ Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 BuildArch:      noarch
 Provides:       tzdata-java = %{version}-%{release}
+Provides:       tzdata-java8 = %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -42,13 +43,23 @@ package is intended for Java Virtual Machine based on OpenJDK.
 # COMMON-PREP-BEGIN
 # COMMON-PREP-END
 
+echo "tzdata%{version}" >> VERSION
+
 %build
-gij -jar %{_javadir}/javazic.jar -V %{version} \
-    -d javazi \
-    africa antarctica asia australasia europe northamerica pacificnew \
-    southamerica backward etcetera systemv  \
-    %{_datadir}/javazic/tzdata_jdk/gmt \
-    %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 6/7 data
+java -jar %{_javadir}/javazic.jar -V %{version} \
+     -d javazi \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/javazic/tzdata_jdk/gmt \
+     %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 8/9 data
+java -jar %{_javadir}/tzdb.jar \
+     -srcdir . -dstfile javazi/tzdb.dat \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/tzdb/tzdata_jdk/gmt \
+     %{_datadir}/tzdb/tzdata_jdk/jdk11_backward
 
 %install
 install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
diff --git a/timezone.changes b/timezone.changes
index 683fb81..e7b7ae1 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov 20 16:19:01 UTC 2014 - fstrba@suse.com
+
+- make timezone-java compatible with Java8
+  * Add generation of tzdb.dat used by Java8 and Java9
+  * Require tzdb package to be able to generate this database
+  * Build using java-bootstrap 1.7 used in openSUSE:Factory to
+    bootstrap java-1_7_0-openjdk
+  * Add virtual provider tzdata-java8 in order to be able to
+    require it for java-1_8_0-openjdk
+
 -------------------------------------------------------------------
 Tue Nov 11 18:36:37 UTC 2014 - andreas.stieger@gmx.de