diff --git a/debian/changelog b/debian/changelog
index 326cba4..c5e9cd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@
     and invalid-short-name-in-dep5-copyright in debian/copyright.
 
   [ Emmanuel Bourg ]
+  * Fixed the build failure with Java 9 (Closes: #875418)
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
diff --git a/debian/patches/02_fix_generic_ftbfs.patch b/debian/patches/02_fix_generic_ftbfs.patch
index faf9a85..bcbd4c8 100644
--- a/debian/patches/02_fix_generic_ftbfs.patch
+++ b/debian/patches/02_fix_generic_ftbfs.patch
@@ -1,7 +1,5 @@
-Index: java3d-1.5.2+dfsg/j3d-core/build.xml
-===================================================================
---- java3d-1.5.2+dfsg.orig/j3d-core/build.xml	2010-01-09 18:52:55.000000000 +0530
-+++ java3d-1.5.2+dfsg/j3d-core/build.xml	2010-01-09 20:24:13.000000000 +0530
+--- a/j3d-core/build.xml
++++ b/j3d-core/build.xml
 @@ -196,6 +196,15 @@
      <property name="install.bin" value="lib/ppc"/>
    </target>
@@ -41,10 +39,8 @@
      <condition property="isSolarisOnSparc">
          <os name="SunOS" arch="sparc"/>
      </condition>   
-Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml
-===================================================================
---- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml	2010-01-09 18:52:55.000000000 +0530
-+++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml	2010-01-09 20:23:04.000000000 +0530
+--- a/j3d-core/src/native/build.xml
++++ b/j3d-core/src/native/build.xml
 @@ -45,6 +45,13 @@
          <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
    </target>
@@ -91,10 +87,8 @@
  	<property name="bldType" value="opt"/>
  	<property name="javahCoreSrc"     
  	 location="${src}/classes/share/javax/media/j3d"/>
-Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml	2010-01-09 20:23:04.000000000 +0530
+--- /dev/null
++++ b/j3d-core/src/native/ogl/build-linux-generic.xml
 @@ -0,0 +1,74 @@
 +<?xml version="1.0"?>
 +
@@ -121,13 +115,13 @@
 +    <echo message="Executing native renderer build [${bldType}]"/>
 +
 +    <!-- Compile the c source files-->
-+    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
-+	<arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc" >
++	<arg line="-fPIC -I${oglsrc}  -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
 +    </exec>
 +
 +    <!-- Create the library file-->
 +    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm  -o libj3dcore-ogl.so"/>
++	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -L${java.home}/lib -ljawt -L${java.home}/lib/${os.arch}/server -L${java.home}/lib/server -ljvm  -o libj3dcore-ogl.so"/>
 +    </exec>
 +
 +  </target>
@@ -135,7 +129,7 @@
 +  <target name="compile-ogl-cg" if="build.cg">
 +    <!-- Compile the wrapper -->
 +    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
-+	<arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++	<arg line="-fPIC -I${oglsrc}  -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
 +    </exec>
 +
 +    <!-- Create the wrapper library -->
diff --git a/debian/patches/07_java9_compatibility.patch b/debian/patches/07_java9_compatibility.patch
new file mode 100644
index 0000000..cfdacb3
--- /dev/null
+++ b/debian/patches/07_java9_compatibility.patch
@@ -0,0 +1,72 @@
+Description: Fixes the build failure with Java 9 caused by the new layout of the JDK directory
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/j3d-core/src/native/ogl/build-linux-amd64.xml
++++ b/j3d-core/src/native/ogl/build-linux-amd64.xml
+@@ -25,12 +25,12 @@
+     <!-- Compile the c source files-->
+     <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+-	<arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c  ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
++	<arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c  ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
+     </exec>
+ 
+     <!-- Create the library file-->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
+-	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib64 -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/amd64 -ljawt -L${java.home}/lib/amd64/server -ljvm  -o libj3dcore-ogl.so"/>
++	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib64 -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/amd64 -L${java.home}/lib -ljawt -L${java.home}/lib/amd64/server -L${java.home}/lib/server -ljvm  -o libj3dcore-ogl.so"/>
+     </exec>
+ 
+   </target>
+@@ -38,7 +38,7 @@
+   <target name="compile-ogl-cg" if="build.cg">
+     <!-- Compile the wrapper -->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+-	<arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++	<arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
+     </exec>
+ 
+     <!-- Create the wrapper library -->
+--- a/j3d-core/src/native/ogl/build-linux-i586.xml
++++ b/j3d-core/src/native/ogl/build-linux-i586.xml
+@@ -25,12 +25,12 @@
+     <!-- Compile the c source files-->
+     <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+-	<arg line="-fPIC -w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
++	<arg line="-fPIC -w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
+     </exec>
+ 
+     <!-- Create the library file-->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
+-	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/i386 -ljawt -L${java.home}/lib/i386/server -ljvm  -o libj3dcore-ogl.so"/>
++	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/i386 -L${java.home}/lib -ljawt -L${java.home}/lib/i386/server -L${java.home}/lib/server -ljvm  -o libj3dcore-ogl.so"/>
+     </exec>
+ 
+   </target>
+@@ -38,7 +38,7 @@
+   <target name="compile-ogl-cg" if="build.cg">
+     <!-- Compile the wrapper -->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+-	<arg line="-fPIC -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++	<arg line="-fPIC -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
+     </exec>
+ 
+     <!-- Create the wrapper library -->
+--- a/j3d-core/src/native/ogl/build-linux-ppc.xml
++++ b/j3d-core/src/native/ogl/build-linux-ppc.xml
+@@ -23,12 +23,12 @@
+     <!-- Compile the c source files-->
+     <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+-	<arg line="-fPIC -w -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I/usr/X11R6/include -I${javahCoreTarget} ${bldFlag} -DLINUX -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c  ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
++	<arg line="-fPIC -w -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I/usr/X11R6/include -I${javahCoreTarget} ${bldFlag} -DLINUX -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c  ${oglsrc}/NativeScreenInfo.c  ${oglsrc}/NativeConfigTemplate3D.c  ${oglsrc}/MasterControl.c  ${oglsrc}/GeometryArrayRetained.c  ${oglsrc}/Attributes.c  ${oglsrc}/CgShaderProgram.c  ${oglsrc}/GLSLShaderProgram.c  ${oglsrc}/Lights.c"/>
+     </exec>
+ 
+     <!-- Create the library file-->
+     <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
+-	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ppc -R/usr/openwin/lib -L${java.home}/bin -ljawt -L${java.home}/lib/ppc/server -L${java.home}/bin/classic -ljvm  -o libj3dcore-ogl.so"/>
++	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ppc -R/usr/openwin/lib -L${java.home}/bin -L${java.home}/lib -ljawt -L${java.home}/lib/ppc/server -L${java.home}/bin/classic -L${java.home}/lib/server -ljvm  -o libj3dcore-ogl.so"/>
+     </exec>
+ 
+     <!-- Copy the copyright library file -->
diff --git a/debian/patches/series b/debian/patches/series
index aedaeb5..e557623 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 05_pic_i586.patch
 06_java-compat.patch
 typedef.patch
+07_java9_compatibility.patch