diff --git a/debian/changelog b/debian/changelog
index bd126e7..5849582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jinput (20100502+dfsg-10) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898225)
   * Standards-Version updated to 4.1.4
   * Switch to debhelper level 11
   * Use salsa.debian.org Vcs-* URLs
diff --git a/debian/patches/05java7-compat.patch b/debian/patches/05java7-compat.patch
deleted file mode 100644
index b4f8901..0000000
--- a/debian/patches/05java7-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS with Java7
-
-diff --git a/plugins/linux/build.xml b/plugins/linux/build.xml
-index ad912f4..2848db3 100644
---- a/plugins/linux/build.xml
-+++ b/plugins/linux/build.xml
-@@ -56,6 +56,7 @@
- 		<javah destdir="src/native">
-             <classpath>
-                 <pathelement location="classes"/>
-+                <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
-             </classpath>
- 			<class name="net.java.games.input.LinuxEventDevice"/>
- 			<class name="net.java.games.input.LinuxJoystickDevice"/>
diff --git a/debian/patches/06java10-compat.patch b/debian/patches/06java10-compat.patch
new file mode 100644
index 0000000..24e0ae9
--- /dev/null
+++ b/debian/patches/06java10-compat.patch
@@ -0,0 +1,83 @@
+Description: Fixes the compatibility with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/plugins/linux/build.xml
++++ b/plugins/linux/build.xml
+@@ -12,7 +12,7 @@
+ 
+     <target depends="init" name="compile">
+ 		<!--		<ant dir="src/native" target="createNativeDefinitions.java"/>-->
+-        <javac debug="true" deprecation="true" destdir="classes" source="1.4" target="1.4" srcdir="src/java">
++        <javac debug="true" deprecation="true" destdir="classes" source="1.4" target="1.4" srcdir="src/java" nativeHeaderDir="src/native">
+             <classpath>
+ 				<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
+                 <pathelement location="../../lib/jutils.jar"/>
+@@ -53,13 +53,6 @@
+     </target>
+ 
+     <target depends="init,compile" name="createJNIHeaders">
+-		<javah destdir="src/native">
+-            <classpath>
+-                <pathelement location="classes"/>
+-            </classpath>
+-			<class name="net.java.games.input.LinuxEventDevice"/>
+-			<class name="net.java.games.input.LinuxJoystickDevice"/>
+-		</javah>
+     </target>
+     
+     <target depends="init,createJNIHeaders" name="compileNativeJinputLib" if="linux">
+--- a/plugins/wintab/build.xml
++++ b/plugins/wintab/build.xml
+@@ -9,7 +9,7 @@
+     </target>
+ 
+     <target name="compile" depends="init">
+-        <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
++        <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4" nativeHeaderDir="src/native">
+         	<include name="**/DummyWindow.java"/>
+ 		</javac>
+ 
+@@ -23,16 +23,6 @@
+ 	</target>
+ 
+     <target depends="init,compile" name="create_jniheaders">
+-		<javah destdir="src/native">
+-            <classpath>
+-                <pathelement path="classes"/>
+-                <pathelement location="../../coreAPI/classes"/>
+-            </classpath>
+-			<class name="net.java.games.input.DummyWindow"/>
+-			<class name="net.java.games.input.WinTabContext"/>
+-			<class name="net.java.games.input.WinTabDevice"/>
+-			<class name="net.java.games.input.WinTabComponent"/>
+-		</javah>
+ 	</target>
+ 
+     <target name="compile_native" depends="init,create_jniheaders" if="wintab">
+--- a/plugins/OSX/build.xml
++++ b/plugins/OSX/build.xml
+@@ -18,7 +18,7 @@
+     </target>
+ 
+     <target depends="init" name="compile">
+-        <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java">
++        <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java" nativeHeaderDir="src/native">
+             <classpath>
+                 <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
+                 <pathelement location="../../lib/jutils.jar"/>
+@@ -59,15 +59,6 @@
+     </target>
+ 
+     <target depends="init,compile" name="createJNIHeaders">
+-        <javah destdir="src/native">
+-            <classpath>
+-                <pathelement path="${build}"/>
+-                <pathelement location="../../coreAPI/classes"/>
+-            </classpath>
+-			<class name="net.java.games.input.OSXHIDDeviceIterator"/>
+-			<class name="net.java.games.input.OSXHIDDevice"/>
+-			<class name="net.java.games.input.OSXHIDQueue"/>
+-        </javah>
+     </target>
+ 
+ 	
diff --git a/debian/patches/series b/debian/patches/series
index 4da57db..57889b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 02build.xml.nonfree
 03javadoc
 04jinput-remove-getDeviceUsageBits.patch
-05java7-compat.patch
+06java10-compat.patch