diff -Nru maven-javadoc-plugin-3.0.0/debian/changelog maven-javadoc-plugin-3.0.0/debian/changelog
--- maven-javadoc-plugin-3.0.0/debian/changelog	2018-03-28 13:31:02.000000000 +0000
+++ maven-javadoc-plugin-3.0.0/debian/changelog	2018-04-08 21:17:47.000000000 +0000
@@ -1,3 +1,11 @@
+maven-javadoc-plugin (3.0.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * Modified the patches to work with Java 9 or later (Closes: #895236)
+  * Standards-Version updated to 4.1.4
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 08 Apr 2018 23:17:47 +0200
+
 maven-javadoc-plugin (3.0.0-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru maven-javadoc-plugin-3.0.0/debian/control maven-javadoc-plugin-3.0.0/debian/control
--- maven-javadoc-plugin-3.0.0/debian/control	2018-03-28 13:26:15.000000000 +0000
+++ maven-javadoc-plugin-3.0.0/debian/control	2018-04-08 21:17:26.000000000 +0000
@@ -24,7 +24,7 @@
  libplexus-languages-java,
  libqdox2-java,
  maven-debian-helper (>> 0.4)
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-javadoc-plugin.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-javadoc-plugin.git
 Homepage: http://maven.apache.org/plugins/maven-javadoc-plugin/
diff -Nru maven-javadoc-plugin-3.0.0/debian/patches/ignore-source-errors.patch maven-javadoc-plugin-3.0.0/debian/patches/ignore-source-errors.patch
--- maven-javadoc-plugin-3.0.0/debian/patches/ignore-source-errors.patch	2018-03-28 13:25:00.000000000 +0000
+++ maven-javadoc-plugin-3.0.0/debian/patches/ignore-source-errors.patch	2018-04-08 21:10:09.000000000 +0000
@@ -9,7 +9,7 @@
          }
 +
 +        // ignore source errors when using the default doclet with Java 9
-+        if ( doclet == null && SystemUtils.IS_JAVA_1_9 && !arguments.contains( "--ignore-source-errors" ) )
++        if ( doclet == null && SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9) && !arguments.contains( "--ignore-source-errors" ) )
 +        {
 +            getLog().info("Adding the --ignore-source-errors option");
 +            arguments.add( "--ignore-source-errors" );
diff -Nru maven-javadoc-plugin-3.0.0/debian/patches/openjdk-9-javadoc-path.patch maven-javadoc-plugin-3.0.0/debian/patches/openjdk-9-javadoc-path.patch
--- maven-javadoc-plugin-3.0.0/debian/patches/openjdk-9-javadoc-path.patch	2017-12-11 14:29:49.000000000 +0000
+++ maven-javadoc-plugin-3.0.0/debian/patches/openjdk-9-javadoc-path.patch	2018-04-08 21:13:15.000000000 +0000
@@ -5,7 +5,7 @@
              javadocExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand );
          }
 +        // On Java 9, this has moved to: /usr/lib/jvm/java-9-openjdk-amd64/bin/javadoc
-+        else if ( SystemUtils.IS_JAVA_1_9 )
++        else if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_9 ) )
 +        {
 +            javadocExe =
 +                new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand );
diff -Nru maven-javadoc-plugin-3.0.0/debian/rules maven-javadoc-plugin-3.0.0/debian/rules
--- maven-javadoc-plugin-3.0.0/debian/rules	2018-03-28 13:26:15.000000000 +0000
+++ maven-javadoc-plugin-3.0.0/debian/rules	2018-04-08 21:17:35.000000000 +0000
@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename