diff -Nru gtk-doc-1.25/debian/changelog gtk-doc-1.25/debian/changelog
--- gtk-doc-1.25/debian/changelog	2016-04-04 05:05:48.000000000 +0000
+++ gtk-doc-1.25/debian/changelog	2016-04-27 19:24:22.000000000 +0000
@@ -1,3 +1,18 @@
+gtk-doc (1.25-2ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - debian/control.in: Drop optional highlight dependency, which is in
+      universe.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 27 Apr 2016 21:21:47 +0200
+
+gtk-doc (1.25-2) unstable; urgency=medium
+
+  * Cherry-pick upstream patch to fix the exit code of gtkdoc-mkpdf.
+    (Closes: #819838)
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 20 Apr 2016 14:05:16 +0200
+
 gtk-doc (1.25-1ubuntu1) xenial; urgency=medium
 
   * Merge from Debian unstable, remaining change:
diff -Nru gtk-doc-1.25/debian/control gtk-doc-1.25/debian/control
--- gtk-doc-1.25/debian/control	2016-04-04 05:18:44.000000000 +0000
+++ gtk-doc-1.25/debian/control	2016-04-27 19:24:46.000000000 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Dmitry Shachnev <mitya57@debian.org>, Iain Lane <laney@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Dmitry Shachnev <mitya57@debian.org>, Iain Lane <laney@debian.org>, Michael Biebl <biebl@debian.org>
 Standards-Version: 3.9.7
 Build-Depends: cdbs,
                debhelper (>= 9),
diff -Nru gtk-doc-1.25/debian/patches/0001-mkpdf-fix-exitcode.patch gtk-doc-1.25/debian/patches/0001-mkpdf-fix-exitcode.patch
--- gtk-doc-1.25/debian/patches/0001-mkpdf-fix-exitcode.patch	1970-01-01 00:00:00.000000000 +0000
+++ gtk-doc-1.25/debian/patches/0001-mkpdf-fix-exitcode.patch	2016-04-20 11:53:33.000000000 +0000
@@ -0,0 +1,28 @@
+From 1baf9a63bdf3283832be06bce151835922909436 Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Tue, 19 Apr 2016 20:39:40 +0200
+Subject: [PATCH] mkpdf: fix exitcode
+
+Fix a regression from 12adab6b0a28aec4008c6deed247bf944b5882f2.
+
+Fixes #764543
+---
+ gtkdoc-mkpdf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in
+index 908fda4..8d663b7 100644
+--- a/gtkdoc-mkpdf.in
++++ b/gtkdoc-mkpdf.in
+@@ -19,7 +19,7 @@ EOF
+ 
+ cleanexit() {
+     rm -f $module.fo
+-    exit 1
++    exit $1
+ }
+ 
+ # parse options, ignore unknown options for future extensions
+-- 
+2.8.1
+
diff -Nru gtk-doc-1.25/debian/patches/series gtk-doc-1.25/debian/patches/series
--- gtk-doc-1.25/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ gtk-doc-1.25/debian/patches/series	2016-04-20 11:53:38.000000000 +0000
@@ -0,0 +1 @@
+0001-mkpdf-fix-exitcode.patch