diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes
index 750664f..2782f1b 100644
--- a/java-atk-wrapper.changes
+++ b/java-atk-wrapper.changes
@@ -4,10 +4,8 @@ Thu Oct 26 20:31:48 UTC 2017 - fstrba@suse.com
 - Added patch:
   * jaw-java9.patch
     + Let the java-atk-wrapper implement the
-      javax.accessibility.AccessibilityProvider
-	+ Require jdk9 for build, since this class was introduced in
-	  jdk9
-- Build with jdk9 or higher
+      javax.accessibility.AccessibilityProvider if building with
+      jdk9
 
 -------------------------------------------------------------------
 Thu Oct 26 20:21:22 UTC 2017 - fstrba@suse.com
diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec
index 3930b26..f5140a1 100644
--- a/java-atk-wrapper.spec
+++ b/java-atk-wrapper.spec
@@ -35,6 +35,7 @@ Patch2:         jaw-quotes.patch
 Patch3:         jaw-java9.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  java-devel >= 1-7
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  xprop
@@ -51,11 +52,6 @@ BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 Requires:       java >= 1.7
 Requires:       xprop
-%if 0%{?suse_version} >= 1330
-BuildRequires:  java-devel >= 9
-%else
-BuildRequires:  java-devel >= 1-7
-%endif
 
 %description
 Java ATK Wrapper is a implementation of ATK by using JNI technic. It
@@ -72,7 +68,7 @@ change of underlying communication mechanism.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%if 0%{?suse_version} >= 1330
+%if %{?pkg_vcmp:%{pkg_vcmp} java-devel >= 9}%{!?pkg_vcmp:0}
 %patch3 -p1
 %endif
 cp %{SOURCE1} .