diff -Nru php-sabre-http-4.2.1/debian/changelog php-sabre-http-4.2.1/debian/changelog
--- php-sabre-http-4.2.1/debian/changelog	2016-03-12 16:28:55.000000000 -0800
+++ php-sabre-http-4.2.1/debian/changelog	2016-03-15 11:20:37.000000000 -0700
@@ -1,3 +1,13 @@
+php-sabre-http (4.2.1-3ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable (LP: #1557599). Remaining changes: 
+    - Add php-mbstring as a test dependency.
+  * Drop:
+    - Add php-mbstring as a build dependency.
+      [ Fixed in Debian]
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 15 Mar 2016 11:19:35 -0700
+
 php-sabre-http (4.2.1-3) unstable; urgency=medium
 
   * PHP 7.0 transition:
@@ -8,6 +18,18 @@
 
  -- David Prévot <taffit@debian.org>  Sat, 12 Mar 2016 19:32:26 -0400
 
+php-sabre-http (4.2.1-2ubuntu2) xenial; urgency=medium
+
+  * d/tests/control: fix typo in php-mbstring (LP: #1557599).
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 15 Mar 2016 10:26:03 -0700
+
+php-sabre-http (4.2.1-2ubuntu1) xenial; urgency=medium
+
+  * Add php-mbstring as a build & test dependency (LP: #1557599).
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 15 Mar 2016 08:27:30 -0700
+
 php-sabre-http (4.2.1-2) unstable; urgency=medium
 
   * Upload to unstable now that php-sabre-http-3 provides the needed
diff -Nru php-sabre-http-4.2.1/debian/control php-sabre-http-4.2.1/debian/control
--- php-sabre-http-4.2.1/debian/control	2016-03-12 16:28:55.000000000 -0800
+++ php-sabre-http-4.2.1/debian/control	2016-03-15 11:20:49.000000000 -0700
@@ -1,7 +1,8 @@
 Source: php-sabre-http
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper (>= 9),
                php-codesniffer,
diff -Nru php-sabre-http-4.2.1/debian/tests/control php-sabre-http-4.2.1/debian/tests/control
--- php-sabre-http-4.2.1/debian/tests/control	2016-03-12 16:28:55.000000000 -0800
+++ php-sabre-http-4.2.1/debian/tests/control	2016-03-15 11:25:05.000000000 -0700
@@ -3,4 +3,4 @@
 
 Tests: phpunit
 Restrictions: rw-build-tree
-Depends: @, patch, php-curl, php-xdebug, phpunit
+Depends: @, patch, php-curl, php-mbstring, php-xdebug, phpunit