diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes
index 05144d5..a229fe0 100644
--- a/xmlgraphics-fop.changes
+++ b/xmlgraphics-fop.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 29 06:57:25 UTC 2017 - fstrba@suse.com
+
+- Don't condition the maven defines on release version, but on 
+  _maven_repository being defined
+
 -------------------------------------------------------------------
 Tue Sep 19 07:23:59 UTC 2017 - fstrba@suse.com
 
diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec
index 2fe5082..37b2a0b 100644
--- a/xmlgraphics-fop.spec
+++ b/xmlgraphics-fop.spec
@@ -46,7 +46,7 @@ BuildRequires:  apache-pdfbox
 BuildRequires:  avalon-framework
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gpg2
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel-openjdk >= 1.8.0.121
 # Needed for maven conversions
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
@@ -189,10 +189,10 @@ popd
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_mavenpomdir}/*
-%if 0%{?suse_version} >= 1330
-%{_datadir}/maven-metadata/%{name}.xml*
-%else
+%if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
 %endif
 %{_mandir}/man1/*
 %config(noreplace) %{_sysconfdir}/fop.xconf