diff -pruN 1.0.1-3/debian/changelog 1.0.1-3ubuntu1/debian/changelog
--- 1.0.1-3/debian/changelog	2016-06-08 17:31:44.000000000 +0000
+++ 1.0.1-3ubuntu1/debian/changelog	2018-02-20 23:06:03.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-service-gravatar (1.0.1-3ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 20 Feb 2018 15:06:03 -0800
+
 php-horde-service-gravatar (1.0.1-3) unstable; urgency=medium
 
   * Update Standards-Version to 3.9.8, no change
diff -pruN 1.0.1-3/debian/control 1.0.1-3ubuntu1/debian/control
--- 1.0.1-3/debian/control	2016-06-08 17:31:44.000000000 +0000
+++ 1.0.1-3ubuntu1/debian/control	2018-02-20 23:06:03.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-service-gravatar
 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 1.0.1-3/debian/patches/phpunit6_compat.patch 1.0.1-3ubuntu1/debian/patches/phpunit6_compat.patch
--- 1.0.1-3/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.0.1-3ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-20 23:06:03.000000000 +0000
@@ -0,0 +1,36 @@
+Description: PHPUnit 6 has namespaced classes
+ Also getMock has been removed.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-20
+
+--- a/Horde_Service_Gravatar-1.0.1/test/Horde/Service/Gravatar/GravatarTest.php
++++ b/Horde_Service_Gravatar-1.0.1/test/Horde/Service/Gravatar/GravatarTest.php
+@@ -21,7 +21,7 @@
+  * @package   Service_Gravatar
+  */
+ class Horde_Service_Gravatar_GravatarTest
+-extends PHPUnit_Framework_TestCase
++extends PHPUnit\Framework\TestCase
+ {
+     public function testReturn()
+     {
+@@ -138,12 +138,16 @@
+ 
+     private function _getMockedGravatar($response_string)
+     {
+-        $response = $this->getMock('Horde_Http_Response', array('getBody'));
++        $response = $this->getMockBuilder('Horde_Http_Response')
++            ->setMethods(array('getBody'))
++            ->getMock();
+         $response->expects($this->once())
+             ->method('getBody')
+             ->will($this->returnValue($response_string));
+ 
+-        $mock = $this->getMock('Horde_Http_Client', array('get'));
++        $mock = $this->getMockBuilder('Horde_Http_Client')
++            ->setMethods(array('get'))
++            ->getMock();
+         $mock->expects($this->once())
+             ->method('get')
+             ->will($this->returnValue($response));
diff -pruN 1.0.1-3/debian/patches/series 1.0.1-3ubuntu1/debian/patches/series
--- 1.0.1-3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 1.0.1-3ubuntu1/debian/patches/series	2018-02-20 23:05:40.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch