diff -Nru openscad-2015.03-2+dfsg/debian/changelog openscad-2015.03-2+dfsg/debian/changelog
--- openscad-2015.03-2+dfsg/debian/changelog	2016-11-27 16:37:27.000000000 +0000
+++ openscad-2015.03-2+dfsg/debian/changelog	2016-11-28 14:01:58.000000000 +0000
@@ -1,3 +1,10 @@
+openscad (2015.03-2+dfsg-2ubuntu1) zesty; urgency=medium
+
+  * Revert the Build-Conflicts change; on Ubuntu qtbase5-dev Depends on
+    libgles2-dev.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Mon, 28 Nov 2016 14:01:58 +0000
+
 openscad (2015.03-2+dfsg-2) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru openscad-2015.03-2+dfsg/debian/control openscad-2015.03-2+dfsg/debian/control
--- openscad-2015.03-2+dfsg/debian/control	2016-11-27 12:27:06.000000000 +0000
+++ openscad-2015.03-2+dfsg/debian/control	2016-11-28 14:01:58.000000000 +0000
@@ -1,6 +1,7 @@
 Source: openscad
 Priority: optional
-Maintainer: Christian M. Amsüss <chrysn@fsfe.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christian M. Amsüss <chrysn@fsfe.org>
 # libcgal-qt5-dev is a workaround for http://bugs.debian.org/804539
 Build-Depends:
     debhelper (>= 10),
@@ -42,7 +43,7 @@
 # https://github.com/openscad/openscad/issues/292 and in debian as
 # http://bugs.debian.org/797816
 Build-Conflicts:
-    libgles2-mesa-dev
+    libgles2-dev
 Standards-Version: 3.9.8
 Section: graphics
 Homepage: http://openscad.org/