diff -Nru mailmanclient-3.1.1/debian/changelog mailmanclient-3.1.1/debian/changelog
--- mailmanclient-3.1.1/debian/changelog	2018-01-05 21:32:50.000000000 +0000
+++ mailmanclient-3.1.1/debian/changelog	2018-03-16 20:55:03.000000000 +0000
@@ -1,3 +1,18 @@
+mailmanclient (3.1.1-5) unstable; urgency=medium
+
+  [ Jonas Meurer ]
+  * d/control:
+    - Update Vcs fields to point to new repository on salsa.debian.org
+    - Degrade Recommends on mailman3 to Suggests, reflect package rename
+
+  [ Pierre-Elliott Bécue ]
+  * d/control:
+    - Raise build dependency on debhelper to version11
+  * d/compat: bump to 11
+  * Drop the new-package-should-not-package-python2-module override
+
+ -- Pierre-Elliott Bécue <becue@crans.org>  Fri, 16 Mar 2018 21:55:03 +0100
+
 mailmanclient (3.1.1-4) unstable; urgency=medium
 
   * Add lintian-override for python-mailmanclient regarding python2 packaging.
diff -Nru mailmanclient-3.1.1/debian/compat mailmanclient-3.1.1/debian/compat
--- mailmanclient-3.1.1/debian/compat	2017-09-26 08:14:15.000000000 +0000
+++ mailmanclient-3.1.1/debian/compat	2018-03-16 16:07:21.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru mailmanclient-3.1.1/debian/control mailmanclient-3.1.1/debian/control
--- mailmanclient-3.1.1/debian/control	2018-01-05 21:32:45.000000000 +0000
+++ mailmanclient-3.1.1/debian/control	2018-03-16 16:07:29.000000000 +0000
@@ -4,7 +4,7 @@
            Jonas Meurer <jonas@freesources.org>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
                dh-python,
                python-all,
                python-httplib2,
@@ -18,8 +18,8 @@
                python3-setuptools,
 Standards-Version: 4.1.3
 Homepage: https://gitlab.com/mailman/mailmanclient
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mailman/mailmanclient.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-mailman/mailmanclient.git
+Vcs-Browser: https://salsa.debian.org/mailman-team/mailmanclient
+Vcs-Git: https://salsa.debian.org/mailman-team/mailmanclient.git
 Testsuite: autopkgtest-pkg-python
 X-Python-Version: >= 2.6
 
@@ -29,8 +29,7 @@
          python-six,
          ${misc:Depends},
          ${python:Depends}
-Suggests: python-mailmanclient-doc
-Recommends: mailman3-core
+Suggests: mailman3, python-mailmanclient-doc
 Description: Python bindings for Mailman3 REST API (Python 2 version)
  Mailmanclient provides the official REST API to interact with Mailman3 server.
  This library is required by the official web interfaces for archive browsing
@@ -44,8 +43,7 @@
          python3-six,
          ${misc:Depends},
          ${python3:Depends}
-Suggests: python-mailmanclient-doc
-Recommends: mailman3-core
+Suggests: mailman3, python-mailmanclient-doc
 Description: Python bindings for Mailman3 REST API (Python 3 version)
  Mailmanclient provides the official REST API to interact with Mailman3 server.
  This library is required by the official web interfaces for archive browsing
diff -Nru mailmanclient-3.1.1/debian/python-mailmanclient.lintian-overrides mailmanclient-3.1.1/debian/python-mailmanclient.lintian-overrides
--- mailmanclient-3.1.1/debian/python-mailmanclient.lintian-overrides	2017-12-11 15:01:59.000000000 +0000
+++ mailmanclient-3.1.1/debian/python-mailmanclient.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# mailmanclient serves as a library to both postorius and hyperkitty packages,
-# that provide frontend for mailman3 management. Upstream is currently working
-# on python3 compatibility of hyperkitty/django-mailman3/postorius[1-3]. In
-# the meantime, this package will provide the python2 bindings along with its
-# python3 bindings.
-#
-# [1] https://gitlab.com/mailman/django-mailman3/merge_requests/20
-# [2] https://gitlab.com/mailman/postorius/merge_requests/255
-# [3] https://gitlab.com/mailman/hyperkitty/merge_requests/67
-python-mailmanclient: new-package-should-not-package-python2-module
diff -Nru mailmanclient-3.1.1/debian/rules mailmanclient-3.1.1/debian/rules
--- mailmanclient-3.1.1/debian/rules	2017-12-05 12:12:49.000000000 +0000
+++ mailmanclient-3.1.1/debian/rules	2018-03-16 20:55:03.000000000 +0000
@@ -4,18 +4,12 @@
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-# Tests disabled as they require a running mailman3-core server
+# Tests disabled as they require a running mailman3 server
 override_dh_auto_test:
 
-
 override_dh_auto_build:
 	PYTHONPATH=. sphinx-build -b html -c ./ -E -N . build/sphinx/html
 	dh_auto_build
 
 override_dh_installchangelogs:
 	dh_installchangelogs src/mailmanclient/docs/NEWS.rst
-
-override_dh_installdocs:
-	dh_installdocs
-	mv debian/python-mailmanclient-doc/usr/share/doc/python-mailmanclient-doc/html \
-	   debian/python-mailmanclient-doc/usr/share/doc/python-mailmanclient/html