diff -pruN 2.1.2-2/debian/changelog 2.1.2-2ubuntu1/debian/changelog
--- 2.1.2-2/debian/changelog	2016-06-08 05:58:05.000000000 +0000
+++ 2.1.2-2ubuntu1/debian/changelog	2018-02-21 21:35:20.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-itip (2.1.2-2ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 21 Feb 2018 13:35:20 -0800
+
 php-horde-itip (2.1.2-2) unstable; urgency=medium
 
   * Update Standards-Version to 3.9.8, no change
diff -pruN 2.1.2-2/debian/control 2.1.2-2ubuntu1/debian/control
--- 2.1.2-2/debian/control	2016-06-08 05:58:05.000000000 +0000
+++ 2.1.2-2ubuntu1/debian/control	2018-02-21 21:35:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-itip
 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.1.2-2/debian/patches/phpunit6_compat.patch 2.1.2-2ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.1.2-2/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.2-2ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:35:18.000000000 +0000
@@ -0,0 +1,38 @@
+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-itip-2.1.2.orig/Horde_Itip-2.1.2/test/Horde/Itip/Integration/ItipTest.php
++++ php-horde-itip-2.1.2/Horde_Itip-2.1.2/test/Horde/Itip/Integration/ItipTest.php
+@@ -29,7 +29,7 @@
+  * @link       http://pear.horde.org/index.php?package=Itip
+  */
+ class Horde_Itip_Integration_ItipTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public static function setUpBeforeClass()
+     {
+--- php-horde-itip-2.1.2.orig/Horde_Itip-2.1.2/test/Horde/Itip/Unit/Event/VeventTest.php
++++ php-horde-itip-2.1.2/Horde_Itip-2.1.2/test/Horde/Itip/Unit/Event/VeventTest.php
+@@ -16,7 +16,7 @@
+  * @link       http://pear.horde.org/index.php?package=Itip
+  */
+ class Horde_Itip_Unit_Event_VeventTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testGetMethodReturnsMethod()
+     {
+--- php-horde-itip-2.1.2.orig/Horde_Itip-2.1.2/test/Horde/Itip/Unit/Response/Type/BaseTest.php
++++ php-horde-itip-2.1.2/Horde_Itip-2.1.2/test/Horde/Itip/Unit/Response/Type/BaseTest.php
+@@ -29,7 +29,7 @@
+  * @link       http://pear.horde.org/index.php?package=Itip
+  */
+ class Horde_Itip_Unit_Response_Type_BaseTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     /**
+      * @expectedException Horde_Itip_Exception
diff -pruN 2.1.2-2/debian/patches/series 2.1.2-2ubuntu1/debian/patches/series
--- 2.1.2-2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.2-2ubuntu1/debian/patches/series	2018-02-21 21:35:00.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch