diff -Nru php-net-ldap2-2.2.0/debian/changelog php-net-ldap2-2.2.0/debian/changelog
--- php-net-ldap2-2.2.0/debian/changelog	2016-06-24 06:41:54.000000000 +0000
+++ php-net-ldap2-2.2.0/debian/changelog	2018-02-14 21:06:16.000000000 +0000
@@ -1,3 +1,10 @@
+php-net-ldap2 (2.2.0-3ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has
+    namespaced classes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 14 Feb 2018 13:06:16 -0800
+
 php-net-ldap2 (2.2.0-3) unstable; urgency=medium
 
   [ Nishanth Aravamudan ]
diff -Nru php-net-ldap2-2.2.0/debian/control php-net-ldap2-2.2.0/debian/control
--- php-net-ldap2-2.2.0/debian/control	2016-06-24 06:35:00.000000000 +0000
+++ php-net-ldap2-2.2.0/debian/control	2018-02-14 21:06:16.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-net-ldap2
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: Benoit Mortier <benoit.mortier@opensides.be>,
            Prach Pongpanich <prach@debian.org>
 Build-Depends: debhelper (>= 9),
diff -Nru php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch
--- php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch	2018-02-14 21:06:09.000000000 +0000
@@ -0,0 +1,79 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-14
+
+--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php
++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php
+@@ -24,8 +24,8 @@ class Net_LDAP2_EntryTest extends Net_LD
+     public static function main() {
+         require_once "PHPUnit/TextUI/TestRunner.php";
+ 
+-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_EntryTest");
+-        $result = PHPUnit_TextUI_TestRunner::run($suite);
++        $suite  = new PHPUnit\Framework\TestSuite("Net_LDAP2_EntryTest");
++        $result = PHPUnit\TextUI\TestRunner::run($suite);
+     }
+ 
+     /**
+--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php
++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php
+@@ -21,8 +21,8 @@ class Net_LDAP2_FilterTest extends Net_L
+     public static function main() {
+         require_once "PHPUnit/TextUI/TestRunner.php";
+ 
+-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_FilterTest");
+-        $result = PHPUnit_TextUI_TestRunner::run($suite);
++        $suite  = new PHPUnit\Framework\TestSuite("Net_LDAP2_FilterTest");
++        $result = PHPUnit\TextUI\TestRunner::run($suite);
+     }
+ 
+     /**
+--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php
++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php
+@@ -91,8 +91,8 @@ class Net_LDAP2_LDIFTest extends Net_LDA
+     public static function main() {
+         require_once "PHPUnit/TextUI/TestRunner.php";
+ 
+-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_LDIFTest");
+-        $result = PHPUnit_TextUI_TestRunner::run($suite);
++        $suite  = new PHPUnit\Framework\TestSuite("Net_LDAP2_LDIFTest");
++        $result = PHPUnit\TextUI\TestRunner::run($suite);
+     }
+ 
+     /**
+--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php
++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php
+@@ -16,8 +16,8 @@ class Net_LDAP2_RootDSETest extends Net_
+     public static function main() {
+         require_once "PHPUnit/TextUI/TestRunner.php";
+ 
+-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_RootDSETest");
+-        $result = PHPUnit_TextUI_TestRunner::run($suite);
++        $suite  = new PHPUnit\Framework\TestSuite("Net_LDAP2_RootDSETest");
++        $result = PHPUnit\TextUI\TestRunner::run($suite);
+     }
+ 
+     /**
+--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php
++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php
+@@ -1,5 +1,5 @@
+ <?php
+-class Net_LDAP2_TestBase extends PHPUnit_Framework_TestCase
++class Net_LDAP2_TestBase extends PHPUnit\Framework\TestCase
+ {
+     public static function assertTrue($condition, $msg = null)
+     {
+--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php
++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php
+@@ -16,8 +16,8 @@ class Net_LDAP2_UtilTest extends Net_LDA
+     public static function main() {
+         require_once "PHPUnit/TextUI/TestRunner.php";
+ 
+-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_UtilTest");
+-        $result = PHPUnit_TextUI_TestRunner::run($suite);
++        $suite  = new PHPUnit\Framework\TestSuite("Net_LDAP2_UtilTest");
++        $result = PHPUnit\TextUI\TestRunner::run($suite);
+     }
+ 
+     /**
diff -Nru php-net-ldap2-2.2.0/debian/patches/series php-net-ldap2-2.2.0/debian/patches/series
--- php-net-ldap2-2.2.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ php-net-ldap2-2.2.0/debian/patches/series	2018-02-14 21:05:49.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compatibility.patch