diff -Nru libcommons-lang-java-2.6/debian/changelog libcommons-lang-java-2.6/debian/changelog
--- libcommons-lang-java-2.6/debian/changelog	2016-03-16 19:13:39.000000000 -0300
+++ libcommons-lang-java-2.6/debian/changelog	2017-06-27 22:48:54.000000000 -0300
@@ -1,3 +1,10 @@
+libcommons-lang-java (2.6-6ubuntu3) UNRELEASED; urgency=medium
+
+  * Drop Ubuntu diff, no longer required and causes other packages
+    to fail. LP: #1652759.
+
+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>  Wed, 28 Jun 2017 01:48:54 +0000
+
 libcommons-lang-java (2.6-6ubuntu2) xenial; urgency=medium
 
   * d/libcommons-lang-java.poms: do not reference javadoc.jar
diff -Nru libcommons-lang-java-2.6/debian/control libcommons-lang-java-2.6/debian/control
--- libcommons-lang-java-2.6/debian/control	2016-03-08 07:48:58.000000000 -0300
+++ libcommons-lang-java-2.6/debian/control	2017-06-27 22:48:54.000000000 -0300
@@ -11,6 +11,7 @@
  default-jdk,
  maven-repo-helper (>= 1.7)
 Build-Depends-Indep:
+ bnd (>= 2.1.0),
  default-jdk-doc,
  junit (>= 3.8.1),
  libcommons-parent-java (>= 12)
diff -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java.poms libcommons-lang-java-2.6/debian/libcommons-lang-java.poms
--- libcommons-lang-java-2.6/debian/libcommons-lang-java.poms	2016-03-16 19:13:39.000000000 -0300
+++ libcommons-lang-java-2.6/debian/libcommons-lang-java.poms	2017-06-27 22:48:54.000000000 -0300
@@ -23,4 +23,5 @@
 #   --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 --has-package-version --artifact=target/commons-lang-*[^javadoc].jar --java-lib
+pom.xml --has-package-version --artifact=target/commons-lang.bnd.jar --java-lib
+
diff -Nru libcommons-lang-java-2.6/debian/rules libcommons-lang-java-2.6/debian/rules
--- libcommons-lang-java-2.6/debian/rules	2016-03-08 07:46:45.000000000 -0300
+++ libcommons-lang-java-2.6/debian/rules	2017-06-27 22:48:54.000000000 -0300
@@ -11,6 +11,9 @@
 
 override_dh_auto_build:
 	ANT_ARGS="-Dbasedir=$(realpath .) -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build
+	cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_UPSTREAM_VERSION)/ > debian/.commons-lang-versioned.bnd
+	echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean
+	bnd wrap --properties debian/.commons-lang-versioned.bnd --output target/commons-lang.bnd.jar target/commons-lang-$(DEB_UPSTREAM_VERSION).jar
 
 get-orig-source:
 	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename