diff -pruN 2.0.4-3/debian/changelog 2.0.4-3ubuntu1/debian/changelog
--- 2.0.4-3/debian/changelog	2016-06-07 20:12:08.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/changelog	2018-02-21 21:44:15.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-controller (2.0.4-3ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 21 Feb 2018 13:44:15 -0800
+
 php-horde-controller (2.0.4-3) unstable; urgency=medium
 
   * Update Standards-Version to 3.9.8, no change
diff -pruN 2.0.4-3/debian/control 2.0.4-3ubuntu1/debian/control
--- 2.0.4-3/debian/control	2016-06-07 20:12:08.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/control	2018-02-21 21:44:15.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-controller
 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.4-3/debian/patches/phpunit6_compat.patch 2.0.4-3ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.0.4-3/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:44:15.000000000 +0000
@@ -0,0 +1,90 @@
+Description: PHPUnit 6 has namespaced classes
+ Also replace getMock with getMockBuilder/getMockForAbstractClass.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-21
+
+--- a/Horde_Controller-2.0.4/test/Horde/Controller/FilterRunnerTest.php
++++ b/Horde_Controller-2.0.4/test/Horde/Controller/FilterRunnerTest.php
+@@ -8,26 +8,32 @@
+ {
+     public function testFilterRunnerDoesNotCallControllerWhenAPreFilterHandlesTheRequest()
+     {
+-        $filter = $this->getMock('Horde_Controller_PreFilter', array('processRequest'));
++        $filter = $this->getMockBuilder('Horde_Controller_PreFilter')
++            ->setMethods(array('processRequest'))
++            ->getMock();
+         $filter->expects($this->once())
+             ->method('processRequest')
+             ->will($this->returnValue(Horde_Controller_PreFilter::REQUEST_HANDLED));
+ 
+         $runner = new Horde_Controller_FilterRunner($this->_getControllerMockNeverCalled());
+         $runner->addPreFilter($filter);
+-        $runner->processRequest($this->getMock('Horde_Controller_Request'), new Horde_Controller_Response());
++        $runner->processRequest($this->createMock('Horde_Controller_Request'), new Horde_Controller_Response());
+     }
+ 
+     public function testShouldUsePreFiltersInFirstInFirstOutOrder()
+     {
+         // The second filter should never be called because first filter returns
+         // REQUEST_HANDLED, meaning it can handle the request.
+-        $preFilter1 = $this->getMock('Horde_Controller_PreFilter', array('processRequest'));
++        $preFilter1 = $this->getMockBuilder('Horde_Controller_PreFilter')
++            ->setMethods(array('processRequest'))
++            ->getMock();
+         $preFilter1->expects($this->once())
+             ->method('processRequest')
+             ->will($this->returnValue(Horde_Controller_PreFilter::REQUEST_HANDLED));
+ 
+-        $preFilter2 = $this->getMock('Horde_Controller_PreFilter', array('processRequest'));
++        $preFilter2 = $this->getMockBuilder('Horde_Controller_PreFilter')
++            ->setMethods(array('processRequest'))
++            ->getMock();
+         $preFilter2->expects($this->never())
+             ->method('processRequest');
+ 
+@@ -41,17 +47,19 @@
+     {
+         // Both filters should be called because the first filter returns
+         // REQUEST_HANDLED, meaning it can handle the request
+-        $postFilter1 = $this->getMock('Horde_Controller_PostFilter', array('processResponse'));
++        $postFilter1 = $this->getMockForAbstractClass('Horde_Controller_PostFilter', array('processRequest'));
+         $postFilter1->expects($this->once())
+             ->method('processResponse')
+             ->will($this->returnValue(Horde_Controller_PreFilter::REQUEST_HANDLED));
+ 
+-        $postFilter2 = $this->getMock('Horde_Controller_PostFilter', array('processResponse'));
++        $postFilter2 = $this->getMockForAbstractClass('Horde_Controller_PostFilter', array('processRequest'));
+         $postFilter2->expects($this->once())
+             ->method('processResponse');
+ 
+ 
+-        $controller = $this->getMock('Horde_Controller', array('processRequest'));
++        $controller = $this->getMockBuilder('Horde_Controller')
++            ->setMethods(array('processRequest'))
++            ->getMock();
+         $controller->expects($this->once())
+             ->method('processRequest');
+ 
+@@ -63,7 +71,9 @@
+ 
+     private function _getControllerMockNeverCalled()
+     {
+-        $controller = $this->getMock('Horde_Controller', array('processRequest'));
++        $controller = $this->getMockBuilder('Horde_Controller')
++            ->setMethods(array('processRequest'))
++            ->getMock();
+         $controller->expects($this->never())
+             ->method('processRequest');
+         return $controller;
+@@ -71,7 +81,9 @@
+ 
+     private function _runFilterRunner(Horde_Controller_FilterRunner $runner)
+     {
+-        $response = $this->getMock('Horde_Controller_Response', array('processRequest'));
++        $response = $this->getMockBuilder('Horde_Controller_Response')
++            ->setMethods(array('processRequest'))
++            ->getMock();
+         $response->expects($this->never())->method('processRequest');
+         $runner->processRequest(new Horde_Controller_Request_Null(), $response);
+     }
diff -pruN 2.0.4-3/debian/patches/series 2.0.4-3ubuntu1/debian/patches/series
--- 2.0.4-3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.4-3ubuntu1/debian/patches/series	2018-02-21 21:43:49.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch