diff -pruN 2.1.7-2/debian/changelog 2.1.7-2ubuntu1/debian/changelog
--- 2.1.7-2/debian/changelog	2016-06-07 22:12:16.000000000 +0000
+++ 2.1.7-2ubuntu1/debian/changelog	2018-02-20 23:01:23.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-perms (2.1.7-2ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 20 Feb 2018 15:01:23 -0800
+
 php-horde-perms (2.1.7-2) unstable; urgency=medium
 
   * Update Standards-Version to 3.9.8, no change
diff -pruN 2.1.7-2/debian/control 2.1.7-2ubuntu1/debian/control
--- 2.1.7-2/debian/control	2016-06-07 22:12:16.000000000 +0000
+++ 2.1.7-2ubuntu1/debian/control	2018-02-20 23:01:23.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-perms
 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.7-2/debian/patches/phpunit6_compat.patch 2.1.7-2ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.1.7-2/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.7-2ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-20 23:01:20.000000000 +0000
@@ -0,0 +1,21 @@
+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
+
+--- php-horde-perms-2.1.7.orig/Horde_Perms-2.1.7/test/Horde/Perms/KolabTest.php
++++ php-horde-perms-2.1.7/Horde_Perms-2.1.7/test/Horde/Perms/KolabTest.php
+@@ -27,11 +27,11 @@
+  * @license    http://www.horde.org/licenses/lgpl21 LGPL 2.1
+  * @link       http://pear.horde.org/index.php?package=Perms
+  */
+-class Horde_Perms_KolabTest extends PHPUnit_Framework_TestCase
++class Horde_Perms_KolabTest extends PHPUnit\Framework\TestCase
+ {
+     public function setUp()
+     {
+-        $this->storage = $this->getMock('Horde_Perms_Permission_Kolab_Storage');
++        $this->storage = $this->createMock('Horde_Perms_Permission_Kolab_Storage');
+         $this->storage->expects($this->once())
+             ->method('getPermissionId')
+             ->will($this->returnValue('test'));
diff -pruN 2.1.7-2/debian/patches/series 2.1.7-2ubuntu1/debian/patches/series
--- 2.1.7-2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.7-2ubuntu1/debian/patches/series	2018-02-20 23:00:58.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch