diff -u witty-3.3.4+dfsg/debian/changelog witty-3.3.4+dfsg/debian/changelog
--- witty-3.3.4+dfsg/debian/changelog
+++ witty-3.3.4+dfsg/debian/changelog
@@ -1,3 +1,11 @@
+witty (3.3.4+dfsg-6ubuntu1) xenial; urgency=medium
+
+  * Drop hardcoded dependency on libmysqlclient18. The macro expansions
+    correctly pick up libmysqlclient20 so this is not required, and we
+    need to drop it for the MySQL 5.7 transition.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Fri, 15 Apr 2016 14:28:34 +0000
+
 witty (3.3.4+dfsg-6build1) xenial; urgency=medium
 
   * Rebuild against libmysqlclient20.
diff -u witty-3.3.4+dfsg/debian/control witty-3.3.4+dfsg/debian/control
--- witty-3.3.4+dfsg/debian/control
+++ witty-3.3.4+dfsg/debian/control
@@ -1,6 +1,7 @@
 Source: witty
 Priority: extra
-Maintainer: Pau Garcia i Quiles <pgquiles@elpauer.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Pau Garcia i Quiles <pgquiles@elpauer.org>
 Build-Depends: debhelper (>= 6.0.7), dpatch, libfcgi-dev, zlib1g-dev,
  libboost-dev (>= 1.36.0), cmake,
  libboost-date-time-dev (>= 1.36.0), libboost-filesystem-dev (>= 1.36.0), 
@@ -327,7 +328,7 @@
 Breaks: witty-dev (<< 3.1.0a-1~)
 Architecture: any
 Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends},
- libwtdbo38 (= ${binary:Version}), libmysqlclient18
+ libwtdbo38 (= ${binary:Version})
 Recommends: libwthttp38 (= ${binary:Version}) | libwtfcgi38 (= ${binary:Version}) |
  libwttest8 (= ${binary:Version})
 Description: MySQL/MariaDB backend for Wt::Dbo [runtime]