diff -pruN 2.1.0-1/debian/changelog 2.1.0-1ubuntu1/debian/changelog
--- 2.1.0-1/debian/changelog	2017-06-30 20:14:05.000000000 +0000
+++ 2.1.0-1ubuntu1/debian/changelog	2018-02-16 00:08:20.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-argv (2.1.0-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has
+    namespaced classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Thu, 15 Feb 2018 16:08:20 -0800
+
 php-horde-argv (2.1.0-1) unstable; urgency=medium
 
   * New upstream version 2.1.0
diff -pruN 2.1.0-1/debian/control 2.1.0-1ubuntu1/debian/control
--- 2.1.0-1/debian/control	2017-06-30 20:14:05.000000000 +0000
+++ 2.1.0-1ubuntu1/debian/control	2018-02-16 00:08:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-argv
 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.0-1/debian/patches/phpunit6_compatibility.patch 2.1.0-1ubuntu1/debian/patches/phpunit6_compatibility.patch
--- 2.1.0-1/debian/patches/phpunit6_compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-1ubuntu1/debian/patches/phpunit6_compatibility.patch	2018-02-16 00:08:17.000000000 +0000
@@ -0,0 +1,16 @@
+Description: PHPUnit 6 has namespaced classes.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan.
+Last-Update: 2018-02-16
+
+--- php-horde-argv-2.1.0.orig/Horde_Argv-2.1.0/test/Horde/Argv/TestCase.php
++++ php-horde-argv-2.1.0/Horde_Argv-2.1.0/test/Horde/Argv/TestCase.php
+@@ -8,7 +8,7 @@
+  * @subpackage UnitTests
+  */
+ 
+-class Horde_Argv_TestCase extends PHPUnit_Framework_TestCase
++class Horde_Argv_TestCase extends PHPUnit\Framework\TestCase
+ {
+     public static function setUpBeforeClass()
+     {
diff -pruN 2.1.0-1/debian/patches/series 2.1.0-1ubuntu1/debian/patches/series
--- 2.1.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-1ubuntu1/debian/patches/series	2018-02-16 00:07:24.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compatibility.patch