diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index fe4dc50..213b1ba 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 26 08:36:52 UTC 2015 - fstrba@suse.com
+
+- Use the tzdb.dat from tzdata-java8 package on distributions
+  that have it.
+
 -------------------------------------------------------------------
 Tue May  5 15:15:09 UTC 2015 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index b1503cd..b9ef1a6 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -342,8 +342,6 @@ Summary:        OpenJDK Runtime Environment
 Group:          Development/Languages
 # Require jpackage-utils for ownership of /usr/lib/jvm/
 Requires:       jpackage-utils
-# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
-Requires:       tzdata-java8
 # Post requires update-alternatives to install tool update-alternatives.
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall tool update-alternatives.
@@ -367,6 +365,10 @@ Provides:       jndi-dns = %{version}
 Provides:       jndi-ldap = %{version}
 Provides:       jndi-rmi = %{version}
 Provides:       jsse = %{version}
+%if 0%{?suse_version} > 1320
+# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
+Requires(post): tzdata-java8
+%endif
 
 %description headless
 The OpenJDK runtime environment without audio and video support.
@@ -937,6 +939,12 @@ update-alternatives \
   --slave %{_jvmjardir}/jre-%{javaver} \
   jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
 
+%if 0%{?suse_version} > 1320
+if [ ! -e %{_jvmdir}/%{jredir}/lib/tzdb.dat ]; then
+    ln -sf %{_datadir}/javazi/tzdb.dat  %{_jvmdir}/%{jredir}/lib/tzdb.dat
+fi
+%endif
+
 %postun headless
 if [ $1 -eq 0 ]
 then
@@ -1150,6 +1158,9 @@ fi
 %if 0%{?suse_version} <= 1130
 %config(noreplace) %{cacerts}
 %endif
+%if 0%{?suse_version} > 1320
+%ghost %{_jvmdir}/%{jredir}/lib/tzdb.dat
+%endif
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs