diff -Nru keybinder-0.3.1/debian/changelog keybinder-0.3.1/debian/changelog
--- keybinder-0.3.1/debian/changelog	2020-04-13 07:56:40.000000000 +0000
+++ keybinder-0.3.1/debian/changelog	2020-12-11 19:58:40.000000000 +0000
@@ -1,9 +1,10 @@
-keybinder (0.3.1-2ubuntu1) focal; urgency=medium
+keybinder (0.3.1-2.1) unstable; urgency=medium
 
-  * Remove empty Object Hierarchy section from documentation index to fix
-    build with gtk-doc 1.32.
+  * Non-maintainer upload.
+  * Fix FTBFS by not referencing documents that were empty (Closes:
+    #939952)
 
- -- William Grant <wgrant@ubuntu.com>  Mon, 13 Apr 2020 17:56:40 +1000
+ -- Paul Gevers <elbrus@debian.org>  Fri, 11 Dec 2020 20:58:40 +0100
 
 keybinder (0.3.1-2) unstable; urgency=medium
 
diff -Nru keybinder-0.3.1/debian/control keybinder-0.3.1/debian/control
--- keybinder-0.3.1/debian/control	2020-04-13 07:56:40.000000000 +0000
+++ keybinder-0.3.1/debian/control	2020-12-11 19:50:52.000000000 +0000
@@ -1,8 +1,7 @@
 Source: keybinder
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Andrew Starr-Bochicchio <asb@debian.org>
+Maintainer: Andrew Starr-Bochicchio <asb@debian.org>
 Build-Depends: debhelper-compat (= 12),
                dh-sequence-gir,
                pkg-config (>= 0.9.0),
diff -Nru keybinder-0.3.1/debian/patches/dont-reference-empty-documents.patch keybinder-0.3.1/debian/patches/dont-reference-empty-documents.patch
--- keybinder-0.3.1/debian/patches/dont-reference-empty-documents.patch	1970-01-01 00:00:00.000000000 +0000
+++ keybinder-0.3.1/debian/patches/dont-reference-empty-documents.patch	2020-12-11 19:58:40.000000000 +0000
@@ -0,0 +1,18 @@
+Author: Paul Gevers <elbrus@debian.org>
+Upstream: https://github.com/ulidtko/keybinder/commit/26a9a16d1ed3a1cb41cb01f11e654fe8af2b2c28
+
+Index: keybinder/docs/keybinder-docs.sgml
+===================================================================
+--- keybinder.orig/docs/keybinder-docs.sgml
++++ keybinder/docs/keybinder-docs.sgml
+@@ -21,10 +21,6 @@
+         <xi:include href="xml/keybinder.xml"/>
+ 
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff -Nru keybinder-0.3.1/debian/patches/fix-gtk-doc-1.32.patch keybinder-0.3.1/debian/patches/fix-gtk-doc-1.32.patch
--- keybinder-0.3.1/debian/patches/fix-gtk-doc-1.32.patch	2020-04-13 07:56:40.000000000 +0000
+++ keybinder-0.3.1/debian/patches/fix-gtk-doc-1.32.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-Index: keybinder-0.3.1/docs/keybinder-docs.sgml
-===================================================================
---- keybinder-0.3.1.orig/docs/keybinder-docs.sgml
-+++ keybinder-0.3.1/docs/keybinder-docs.sgml
-@@ -21,10 +21,6 @@
-         <xi:include href="xml/keybinder.xml"/>
- 
-   </chapter>
--  <chapter id="object-tree">
--    <title>Object Hierarchy</title>
--     <xi:include href="xml/tree_index.sgml"/>
--  </chapter>
-   <index id="api-index-full">
-     <title>API Index</title>
-     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff -Nru keybinder-0.3.1/debian/patches/series keybinder-0.3.1/debian/patches/series
--- keybinder-0.3.1/debian/patches/series	2020-04-13 07:55:22.000000000 +0000
+++ keybinder-0.3.1/debian/patches/series	2020-12-11 19:56:54.000000000 +0000
@@ -1,3 +1,3 @@
 Xkb.patch
 python-multiarch-header-path.patch
-fix-gtk-doc-1.32.patch
+dont-reference-empty-documents.patch