diff -pruN 2.0.9-1/debian/changelog 2.0.9-1ubuntu1/debian/changelog
--- 2.0.9-1/debian/changelog	2016-07-07 20:00:31.000000000 +0000
+++ 2.0.9-1ubuntu1/debian/changelog	2018-02-16 23:54:01.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-kolab-format (2.0.9-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 compatibility
+    changes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 16 Feb 2018 15:54:01 -0800
+
 php-horde-kolab-format (2.0.9-1) unstable; urgency=medium
 
   * New upstream version 2.0.9
diff -pruN 2.0.9-1/debian/control 2.0.9-1ubuntu1/debian/control
--- 2.0.9-1/debian/control	2016-07-07 20:00:31.000000000 +0000
+++ 2.0.9-1ubuntu1/debian/control	2018-02-16 23:54:01.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-kolab-format
 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.0.9-1/debian/patches/phpunit6_compat.patch 2.0.9-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.0.9-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.9-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-16 23:53:58.000000000 +0000
@@ -0,0 +1,136 @@
+Description: PHPUnit 6 compatibility changes
+ Namespaced classes and getMock -> createMock.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-16
+
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/TestCase.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/TestCase.php
+@@ -24,7 +24,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_TestCase
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     private $_factory;
+ 
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/DateTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/DateTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_DateTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function setUp()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php
+@@ -63,7 +63,7 @@ extends Horde_Kolab_Format_TestCase
+     {
+         $this->logger = new Horde_Kolab_Format_Stub_Log();
+         return new Horde_Kolab_Format_Decorator_Memory(
+-            $this->getMock('Horde_Kolab_Format'),
++            $this->createMock('Horde_Kolab_Format'),
+             new Horde_Support_Memory(),
+             $this->logger
+         );
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php
+@@ -85,7 +85,7 @@ extends Horde_Kolab_Format_TestCase
+     public function testNoLog()
+     {
+         $timed = new Horde_Kolab_Format_Decorator_Timed(
+-            $this->getMock('Horde_Kolab_Format'),
++            $this->createMock('Horde_Kolab_Format'),
+             new Horde_Support_Timer(),
+             true
+         );
+@@ -97,7 +97,7 @@ extends Horde_Kolab_Format_TestCase
+     {
+         $this->logger = new Horde_Kolab_Format_Stub_Log();
+         return new Horde_Kolab_Format_Decorator_Timed(
+-            $this->getMock('Horde_Kolab_Format'),
++            $this->createMock('Horde_Kolab_Format'),
+             new Horde_Support_Timer(),
+             $this->logger
+         );
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingUidTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingUidTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_Exception_MissingUidTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testMissingUidTest()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingValueTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingValueTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_Exception_MissingValueTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testMissingValueTest()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/ParseErrorTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/ParseErrorTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_Exception_ParseErrorTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testParseError()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/FactoryTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/FactoryTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_FactoryTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testFactory()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/EnvelopeTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/EnvelopeTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_Xml_EnvelopeTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testSave()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/ParserTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/ParserTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_Xml_ParserTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testParseString()
+     {
+--- php-horde-kolab-format-2.0.9.orig/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/XmlTest.php
++++ php-horde-kolab-format-2.0.9/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/XmlTest.php
+@@ -28,7 +28,7 @@
+  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
+  */
+ class Horde_Kolab_Format_Unit_XmlTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     /**
+      * @expectedException Horde_Kolab_Format_Exception_MissingUid
diff -pruN 2.0.9-1/debian/patches/series 2.0.9-1ubuntu1/debian/patches/series
--- 2.0.9-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.9-1ubuntu1/debian/patches/series	2018-02-16 23:53:28.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch