diff -pruN 2.4.0-1/debian/changelog 2.4.0-1ubuntu1/debian/changelog
--- 2.4.0-1/debian/changelog	2017-07-01 20:01:48.000000000 +0000
+++ 2.4.0-1ubuntu1/debian/changelog	2018-02-21 21:22:26.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-vfs (2.4.0-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 21 Feb 2018 13:22:26 -0800
+
 php-horde-vfs (2.4.0-1) unstable; urgency=medium
 
   * New upstream version 2.4.0
diff -pruN 2.4.0-1/debian/control 2.4.0-1ubuntu1/debian/control
--- 2.4.0-1/debian/control	2017-07-01 20:01:48.000000000 +0000
+++ 2.4.0-1ubuntu1/debian/control	2018-02-21 21:22:26.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-vfs
 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.4.0-1/debian/patches/phpunit6_compat.patch 2.4.0-1ubuntu1/debian/patches/phpunit6_compat.patch
--- 2.4.0-1/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-1ubuntu1/debian/patches/phpunit6_compat.patch	2018-02-21 21:22:22.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-21
+
+--- php-horde-vfs-2.4.0.orig/Horde_Vfs-2.4.0/test/Horde/Vfs/KolabTest.php
++++ php-horde-vfs-2.4.0/Horde_Vfs-2.4.0/test/Horde/Vfs/KolabTest.php
+@@ -27,7 +27,7 @@
+  * @license    http://www.horde.org/licenses/lgpl21 LGPL 2.1
+  * @link       http://pear.horde.org/index.php?package=Vfs
+  */
+-class Horde_Vfs_KolabTest extends PHPUnit_Framework_TestCase
++class Horde_Vfs_KolabTest extends PHPUnit\Framework\TestCase
+ {
+ 
+     /**
diff -pruN 2.4.0-1/debian/patches/series 2.4.0-1ubuntu1/debian/patches/series
--- 2.4.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-1ubuntu1/debian/patches/series	2018-02-21 21:21:57.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch