diff -Nru maven-bundle-plugin-2.5.4/debian/changelog maven-bundle-plugin-2.5.4/debian/changelog
--- maven-bundle-plugin-2.5.4/debian/changelog	2017-08-24 16:49:19.000000000 +0000
+++ maven-bundle-plugin-2.5.4/debian/changelog	2017-08-30 15:32:37.000000000 +0000
@@ -1,3 +1,13 @@
+maven-bundle-plugin (2.5.4-6) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libmaven3-core-java instead of libmaven2-core-java
+  * Depend on libplexus-container-default1.5-java
+    instead of libplexus-container-default-java
+  * Standards-Version updated to 4.1.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 30 Aug 2017 17:32:37 +0200
+
 maven-bundle-plugin (2.5.4-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru maven-bundle-plugin-2.5.4/debian/control maven-bundle-plugin-2.5.4/debian/control
--- maven-bundle-plugin-2.5.4/debian/control	2017-08-24 08:35:09.000000000 +0000
+++ maven-bundle-plugin-2.5.4/debian/control	2017-08-30 15:32:23.000000000 +0000
@@ -15,13 +15,14 @@
                      libmaven-dependency-tree-java,
                      libmaven-javadoc-plugin-java,
                      libmaven-plugin-tools-java,
-                     libmaven2-core-java,
+                     libmaven-reporting-api-java,
+                     libmaven3-core-java,
                      libosgi-compendium-java,
                      libosgi-core-java,
                      libplexus-archiver-java,
-                     libplexus-container-default-java,
+                     libplexus-container-default1.5-java,
                      libplexus-utils2-java
-Standards-Version: 4.0.0
+Standards-Version: 4.1.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-bundle-plugin.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-bundle-plugin.git
 Homepage: http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
diff -Nru maven-bundle-plugin-2.5.4/debian/maven.rules maven-bundle-plugin-2.5.4/debian/maven.rules
--- maven-bundle-plugin-2.5.4/debian/maven.rules	2017-08-24 09:32:36.000000000 +0000
+++ maven-bundle-plugin-2.5.4/debian/maven.rules	2017-08-30 14:51:22.000000000 +0000
@@ -1,7 +1,9 @@
 
 s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * *
 org.apache.maven.shared maven-dependency-tree jar s/.*/debian/ * *
-org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 biz.aQute.bnd s/biz.aQute.bndlib/bndlib/ * s/.*/debian/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/ * *
+org.apache.maven s/maven-core/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven.reporting maven-reporting-api * s/.*/3.x/ * *
diff -Nru maven-bundle-plugin-2.5.4/debian/patches/maven3-compatibility.patch maven-bundle-plugin-2.5.4/debian/patches/maven3-compatibility.patch
--- maven-bundle-plugin-2.5.4/debian/patches/maven3-compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ maven-bundle-plugin-2.5.4/debian/patches/maven3-compatibility.patch	2017-08-30 14:15:29.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Fixes the compatibility with Maven 3
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -113,6 +113,11 @@
+    <version>2.0.7</version>
+   </dependency>
+   <dependency>
++   <groupId>org.apache.maven.reporting</groupId>
++   <artifactId>maven-reporting-api</artifactId>
++   <version>3.x</version>
++  </dependency>
++  <dependency>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-archiver</artifactId>
+    <version>2.5</version>
diff -Nru maven-bundle-plugin-2.5.4/debian/patches/series maven-bundle-plugin-2.5.4/debian/patches/series
--- maven-bundle-plugin-2.5.4/debian/patches/series	2017-08-24 08:33:27.000000000 +0000
+++ maven-bundle-plugin-2.5.4/debian/patches/series	2017-08-30 14:14:02.000000000 +0000
@@ -4,3 +4,4 @@
 use-changelog-date-as-pom.properties-timestamp.patch
 FELIX-4882.patch
 maven-archiver3-869361.patch
+maven3-compatibility.patch