diff -Nru activemq-protobuf-1.1/debian/changelog activemq-protobuf-1.1/debian/changelog
--- activemq-protobuf-1.1/debian/changelog	2017-07-31 15:04:17.000000000 +0000
+++ activemq-protobuf-1.1/debian/changelog	2017-10-24 16:20:13.000000000 +0000
@@ -1,3 +1,14 @@
+activemq-protobuf (1.1-6) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 4.1.1.
+  * Remove empty maven.properties file.
+  * libactivemq-protobuf-java.poms: Remove --has-package-version flag.
+  * Apply activemq-protobuf.diff and fix FTBFS with Java 9.
+    Thanks to Chris West for the report and patch. (Closes: #873205)
+
+ -- Markus Koschany <apo@debian.org>  Tue, 24 Oct 2017 18:20:13 +0200
+
 activemq-protobuf (1.1-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru activemq-protobuf-1.1/debian/control activemq-protobuf-1.1/debian/control
--- activemq-protobuf-1.1/debian/control	2017-07-31 15:00:15.000000000 +0000
+++ activemq-protobuf-1.1/debian/control	2017-10-24 16:20:13.000000000 +0000
@@ -17,7 +17,7 @@
  libmaven3-core-java,
  libsurefire-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/activemq-protobuf.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/activemq-protobuf.git
 Homepage: http://activemq.apache.org/
diff -Nru activemq-protobuf-1.1/debian/libactivemq-protobuf-java.poms activemq-protobuf-1.1/debian/libactivemq-protobuf-java.poms
--- activemq-protobuf-1.1/debian/libactivemq-protobuf-java.poms	2017-07-31 14:54:06.000000000 +0000
+++ activemq-protobuf-1.1/debian/libactivemq-protobuf-java.poms	2017-10-24 16:20:13.000000000 +0000
@@ -23,6 +23,6 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
 #     temporarily for certain artifacts such as Javadoc jars.
 #
-pom.xml --no-parent --has-package-version
-activemq-protobuf/pom.xml --has-package-version --java-lib
-activemq-protobuf-test/pom.xml --ignore-pom --has-package-version --java-lib
+pom.xml --no-parent
+activemq-protobuf/pom.xml --java-lib
+activemq-protobuf-test/pom.xml --ignore-pom --java-lib
diff -Nru activemq-protobuf-1.1/debian/maven.properties activemq-protobuf-1.1/debian/maven.properties
--- activemq-protobuf-1.1/debian/maven.properties	2017-07-31 14:54:06.000000000 +0000
+++ activemq-protobuf-1.1/debian/maven.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-# Include here properties to pass to Maven during the build.
diff -Nru activemq-protobuf-1.1/debian/patches/activemq-protobuf.diff activemq-protobuf-1.1/debian/patches/activemq-protobuf.diff
--- activemq-protobuf-1.1/debian/patches/activemq-protobuf.diff	1970-01-01 00:00:00.000000000 +0000
+++ activemq-protobuf-1.1/debian/patches/activemq-protobuf.diff	2017-10-24 16:20:13.000000000 +0000
@@ -0,0 +1,79 @@
+commit 8b2b15557765acf38f228757a46b0e4dd02a008a
+Author: Chris West (Faux) <git@goeswhere.com>
+Date:   Mon Aug 21 18:20:05 2017 +0100
+
+    fix compilation on java 9
+
+     * Remove unused, invalid import.
+     * Bump source/target versions to something supported.
+     * Override compiler plugin version so it can parse modern compiler output.
+
+diff --git a/activemq-protobuf-test/pom.xml b/activemq-protobuf-test/pom.xml
+index 34d16c8..bae9fa2 100644
+--- a/activemq-protobuf-test/pom.xml
++++ b/activemq-protobuf-test/pom.xml
+@@ -58,8 +58,8 @@
+       <plugin>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.7</source>
++          <target>1.7</target>
+         </configuration>
+       </plugin>
+       <plugin>
+diff --git a/activemq-protobuf/pom.xml b/activemq-protobuf/pom.xml
+index c32b76c..5a5355c 100644
+--- a/activemq-protobuf/pom.xml
++++ b/activemq-protobuf/pom.xml
+@@ -62,8 +62,8 @@
+       <plugin>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.7</source>
++          <target>1.7</target>
+         </configuration>
+       </plugin>
+       <plugin>
+diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
+index c407b44..44ad091 100644
+--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
++++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
+@@ -22,8 +22,6 @@ import java.util.LinkedHashMap;
+ import java.util.List;
+ import java.util.Map;
+
+-import com.sun.org.apache.bcel.internal.generic.BASTORE;
+-
+
+ public class MessageDescriptor implements TypeDescriptor {
+
+diff --git a/pom.xml b/pom.xml
+index e2ce7e7..cb02309 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -175,9 +175,10 @@
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-compiler-plugin</artifactId>
++        <version>3.6.2</version>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.7</source>
++          <target>1.7</target>
+           <optimize>true</optimize>
+           <debug>true</debug>
+           <showDeprecation>true</showDeprecation>
+@@ -271,7 +272,7 @@
+           -->
+           <linksource>true</linksource>
+           <maxmemory>900m</maxmemory>
+-          <source>1.5</source>
++          <source>1.7</source>
+         </configuration>
+       </plugin>
+     </plugins>
diff -Nru activemq-protobuf-1.1/debian/patches/series activemq-protobuf-1.1/debian/patches/series
--- activemq-protobuf-1.1/debian/patches/series	2017-07-31 14:54:06.000000000 +0000
+++ activemq-protobuf-1.1/debian/patches/series	2017-10-24 16:20:13.000000000 +0000
@@ -1 +1,2 @@
 force_version_for_tests.diff
+activemq-protobuf.diff