diff -pruN 2.2.0-1/debian/changelog 2.2.0-1ubuntu1/debian/changelog
--- 2.2.0-1/debian/changelog	2017-12-16 15:19:23.000000000 +0000
+++ 2.2.0-1ubuntu1/debian/changelog	2018-02-20 23:02:33.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-share (2.2.0-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 20 Feb 2018 15:02:33 -0800
+
 php-horde-share (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-12-16 15:19:23.000000000 +0000
+++ 2.2.0-1ubuntu1/debian/control	2018-02-20 23:02:33.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-share
 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-20 23:02:33.000000000 +0000
@@ -0,0 +1,41 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-20
+
+--- a/Horde_Share-2.2.0/test/Horde/Share/Kolab/UnitTest.php
++++ b/Horde_Share-2.2.0/test/Horde/Share/Kolab/UnitTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://pear.horde.org/index.php?package=Share
+  */
+ class Horde_Share_Kolab_UnitTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function setUp()
+     {
+@@ -39,8 +39,9 @@
+ 
+     public function testGetStorage()
+     {
+-        $storage = $this->getMock('Horde_Kolab_Storage');
+-        $list = $this->getMock('Horde_Kolab_Storage_List');
++        $storage = $this->createMock('Horde_Kolab_Storage');
++        $list = $this->getMockBuilder('Horde_Kolab_Storage_List')
++            ->getMock();
+         $storage->expects($this->once())
+             ->method('getList')
+             ->will($this->returnValue($list));
+@@ -533,9 +534,9 @@
+ 
+     public function testListShareCache()
+     {
+-        $storage = $this->getMock('Horde_Kolab_Storage');
+-        $list = $this->getMock('Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false);
+-        $query = $this->getMock('Horde_Kolab_Storage_List_Query_List');
++        $storage = $this->createMock('Horde_Kolab_Storage');
++        $list = $this->createMock('Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false);
++        $query = $this->createMock('Horde_Kolab_Storage_List_Query_List');
+         $query->expects($this->once())
+             ->method('listByType')
+             ->will($this->returnValue(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-20 23:02:11.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch