diff -pruN 2.2.0-1/debian/changelog 2.2.0-1ubuntu1/debian/changelog
--- 2.2.0-1/debian/changelog	2017-07-01 19:54:49.000000000 +0000
+++ 2.2.0-1ubuntu1/debian/changelog	2018-02-21 21:25:33.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-text-diff (2.2.0-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 21 Feb 2018 13:25:33 -0800
+
 php-horde-text-diff (2.2.0-1) unstable; urgency=medium
 
   * New upstream version 2.2.0
diff -pruN 2.2.0-1/debian/control 2.2.0-1ubuntu1/debian/control
--- 2.2.0-1/debian/control	2017-07-01 19:54:49.000000000 +0000
+++ 2.2.0-1ubuntu1/debian/control	2018-02-21 21:25:33.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-text-diff
 Section: php
 Priority: extra
-Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
 Uploaders: Mathieu Parent <sathieu@debian.org>
 Build-Depends: debhelper (>= 9), pkg-php-tools, pear-horde-channel
 Standards-Version: 3.9.8
diff -pruN 2.2.0-1/debian/patches/phpunit6_compat.patch 2.2.0-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.2.0-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.2.0-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:25:30.000000000 +0000
@@ -0,0 +1,16 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-21
+
+--- php-horde-text-diff-2.2.0.orig/Horde_Text_Diff-2.2.0/test/Horde/Text/Diff/EngineTest.php
++++ php-horde-text-diff-2.2.0/Horde_Text_Diff-2.2.0/test/Horde/Text/Diff/EngineTest.php
+@@ -6,7 +6,7 @@
+  * @package    Text_Diff
+  * @subpackage UnitTests
+  */
+-class Horde_Text_Diff_EngineTest extends PHPUnit_Framework_TestCase
++class Horde_Text_Diff_EngineTest extends PHPUnit\Framework\TestCase
+ {
+     protected $_lines = array();
+ 
diff -pruN 2.2.0-1/debian/patches/series 2.2.0-1ubuntu1/debian/patches/series
--- 2.2.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.2.0-1ubuntu1/debian/patches/series	2018-02-21 21:25:09.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch