diff -upr ../webkit2gtk-2.12.3/debian/changelog debian/changelog
--- ../webkit2gtk-2.12.3/debian/changelog	2016-05-24 05:17:47.000000000 -0400
+++ debian/changelog	2016-05-30 11:13:36.066284090 -0400
@@ -1,3 +1,10 @@
+webkit2gtk (2.12.3-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian (LP: #1587095). Remaining change:
+    - Build with geoclue 1 because ubuntu-geoip isn't ported yet
+
+ -- Jeremy Bicha <jbicha@linux.com>  Mon, 30 May 2016 10:57:35 -0400
+
 webkit2gtk (2.12.3-1) unstable; urgency=high
 
   * New upstream release (Closes: #821228).
diff -upr ../webkit2gtk-2.12.3/debian/control debian/control
--- ../webkit2gtk-2.12.3/debian/control	2016-05-24 05:17:47.000000000 -0400
+++ debian/control	2016-05-30 11:01:04.686710124 -0400
@@ -1,7 +1,8 @@
 Source: webkit2gtk
 Priority: optional
 Section: web
-Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers@lists.alioth.debian.org>
 Uploaders: Gustavo Noronha Silva <kov@debian.org>,
            Emilio Pozuelo Monfort <pochu@debian.org>,
            Alberto Garcia <berto@igalia.com>
@@ -37,7 +38,7 @@ Build-Depends: gawk,
                libgstreamer-plugins-base1.0-dev (>= 1.0.3),
                libenchant-dev (>= 0.22),
                gtk-doc-tools,
-               geoclue-2.0,
+               libgeoclue-dev,
                libsecret-1-dev,
                gobject-introspection (>= 1.32.0),
                libgirepository1.0-dev (>= 0.9.12-4),