diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes
index 49466e4..750664f 100644
--- a/java-atk-wrapper.changes
+++ b/java-atk-wrapper.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Thu Oct 26 20:21:22 UTC 2017 - fstrba@suse.com
 
diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec
index b55d378..3930b26 100644
--- a/java-atk-wrapper.spec
+++ b/java-atk-wrapper.spec
@@ -32,9 +32,9 @@ Source3:        https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh
 Patch0:         jaw-avoid-version.patch
 Patch1:         jaw-java_required.patch
 Patch2:         jaw-quotes.patch
+Patch3:         jaw-java9.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  java-devel >= 1.7
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  xprop
@@ -51,6 +51,11 @@ 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
@@ -67,6 +72,9 @@ change of underlying communication mechanism.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if 0%{?suse_version} >= 1330
+%patch3 -p1
+%endif
 cp %{SOURCE1} .
 cp %{SOURCE2} wrapper/
 cp %{SOURCE3} .
diff --git a/jaw-java9.patch b/jaw-java9.patch
new file mode 100644
index 0000000..a3f0774
--- /dev/null
+++ b/jaw-java9.patch
@@ -0,0 +1,101 @@
+--- java-atk-wrapper-0.33.2/configure.ac	2015-07-07 13:52:28.000000000 +0200
++++ java-atk-wrapper-0.33.2/configure.ac	2017-10-26 17:42:11.472221491 +0200
+@@ -64,7 +64,7 @@
+ # java wrapper
+ 
+ AM_CONDITIONAL(USER, test `whoami` = "root")
+-JAVA_REQUIRED=1.7
++JAVA_REQUIRED=9.0
+ JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
+ 
+ AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
+@@ -169,6 +169,8 @@
+     wrapper/org/Makefile
+     wrapper/org/GNOME/Makefile
+     wrapper/org/GNOME/Accessibility/Makefile
++    wrapper/META-INF/Makefile
++    wrapper/META-INF/services/Makefile
+ ])
+ AC_OUTPUT
+ 
+--- java-atk-wrapper-0.33.2/wrapper/Makefile.am	2015-07-01 02:19:15.000000000 +0200
++++ java-atk-wrapper-0.33.2/wrapper/Makefile.am	2017-10-26 17:42:11.472221491 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS=org
++SUBDIRS=org META-INF
+ JARFILES=java-atk-wrapper.jar
+ ALL_CLASSES=org/GNOME/Accessibility/*.class
+ DEP_CLASSES=$(wildcard $(ALL_CLASSES))
+@@ -16,7 +16,7 @@
+ EXTRA_DIST = $(properties_DATA)
+ 
+ $(JARFILES) : $(DEP_CLASSES)
+-	$(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class
++	$(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class META-INF/services/javax.accessibility.AccessibilityProvider
+ 
+ all-local : $(DATA) $(JARFILES)
+ 
+--- java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am	2017-10-26 17:42:11.472221491 +0200
+@@ -0,0 +1 @@
++SUBDIRS=services
+--- java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider	1970-01-01 01:00:00.000000000 +0100
++++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider	2017-10-26 17:42:11.472221491 +0200
+@@ -0,0 +1 @@
++org.GNOME.Accessibility.AtkProvider
+--- java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am	2017-10-26 17:42:11.472221491 +0200
+@@ -0,0 +1 @@
++EXTRA_DIST = javax.accessibility.AccessibilityProvider
+--- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java	1970-01-01 01:00:00.000000000 +0100
++++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java	2017-10-26 17:42:11.472221491 +0200
+@@ -0,0 +1,38 @@
++/*
++ * Java ATK Wrapper for GNOME
++ * Copyright (C) 2017 Oracle and/or its affiliates.
++ * Copyright (C) 2017 Fridrich Strba <fridrich.strba@bluewin.ch>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
++ */
++
++package org.GNOME.Accessibility;
++
++import javax.accessibility.AccessibilityProvider;
++
++public final class AtkProvider extends AccessibilityProvider {
++    private final String name = "org.GNOME.Accessibility.AtkWrapper";
++
++    public AtkProvider() {}
++
++    public String getName() {
++        return name;
++    }
++
++    public void activate() {
++        new AtkWrapper();
++    }
++
++}
+--- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am	2015-06-30 23:56:32.000000000 +0200
++++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am	2017-10-26 17:42:11.472221491 +0200
+@@ -10,7 +10,7 @@
+ 	sed -e "s;\@XPROP\@;${XPROP};g" \
+ 		< $< >$@
+ 
+-%.class : %.java
++%.class : %.java AtkWrapper.java
+ 	CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $(JAVACFLAGS) -d $(top_builddir)/wrapper $<
+ 
+ clean-local: