Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision ddd5a704b0d383a23ff82a56d573ec76838dadb5)
+++ general/genutils/gtk-doc.xml	(revision 7199a097466c4f5923b9fcbb3ca99f3066cb1073)
@@ -7,7 +7,7 @@
   <!ENTITY gtk-doc-download-http "&gnome-download-http;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.xz">
   <!ENTITY gtk-doc-download-ftp  "&gnome-download-ftp;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.xz">
-  <!ENTITY gtk-doc-md5sum        "07764836262e154e94922e5f2aa476ae">
-  <!ENTITY gtk-doc-size          "748 KB">
-  <!ENTITY gtk-doc-buildsize     "14 MB (with tests)">
+  <!ENTITY gtk-doc-md5sum        "4f2a7925c6b1cec4569ccb94e2b58d6b">
+  <!ENTITY gtk-doc-size          "496 KB">
+  <!ENTITY gtk-doc-buildsize     "13 MB (with tests)">
   <!ENTITY gtk-doc-time          "0.2 SBU (with tests)">
 ]>
@@ -76,5 +76,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -87,5 +87,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">GTK-Doc Dependencies</bridgehead>
 
@@ -132,15 +132,10 @@
 
     <para>
-      Apply a fix for building Glib2 documentation:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gtk-doc-&gtk-doc-version;-glib2_fixes-1.patch</userinput></screen>
-
-    <para>
       Install <application>GTK-Doc</application> by running
       the following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>autoreconf -fiv           &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -191,5 +186,5 @@
         <seg>
           /usr/share/gtk-doc and
-          /usr/share/help/*/gtk-doc-manual
+          /usr/share/cmake/GtkDoc
         </seg>
       </seglistitem>
Index: general/genutils/ibus.xml
===================================================================
--- general/genutils/ibus.xml	(revision ddd5a704b0d383a23ff82a56d573ec76838dadb5)
+++ general/genutils/ibus.xml	(revision 7199a097466c4f5923b9fcbb3ca99f3066cb1073)
@@ -7,10 +7,10 @@
   <!ENTITY ibus-download-http "https://github.com/ibus/ibus/releases/download/&ibus-version;/ibus-&ibus-version;.tar.gz">
   <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "717975f7de5b7a6eb89a5966db3e6c2e">
+  <!ENTITY ibus-md5sum        "2e2cf49d449c532171b9d9698f934a01">
   <!ENTITY ibus-size          "3.4 MB">
-  <!ENTITY ibus-buildsize     "77 MB (with tests)">
-  <!ENTITY ibus-time          "0.5 SBU (Using parallelism=4; with tests)">
-
-  <!ENTITY ucd-download-http  "https://www.unicode.org/Public/zipped/10.0.0/UCD.zip">
+  <!ENTITY ibus-buildsize     "75 MB (with tests)">
+  <!ENTITY ibus-time          "0.9 SBU (Using parallelism=4; with tests)">
+
+  <!ENTITY ucd-download-http  "https://www.unicode.org/Public/zipped/13.0.0/UCD.zip">
 ]>
 
@@ -74,14 +74,4 @@
     </itemizedlist>
     
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ibus-&ibus-version;-wayland_display-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    
     <bridgehead renderas="sect3">Optional Download</bridgehead>
 
@@ -90,6 +80,5 @@
         <listitem>
           <para>
-            Download: <ulink url="&ucd-download-http;">
-            &ucd-download-http;</ulink>
+            Download: <ulink url="&ucd-download-http;"> &ucd-download-http;</ulink>
             (Unicode Character Database)
           </para>
@@ -133,16 +122,10 @@
 
     <para>
-      Fix an issue with ibus identifying itself in Wayland sessions:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../ibus-&ibus-version;-wayland_display-1.patch</userinput></screen>
-
-    <para>
       If the optional Unicode Character Database was downloaded, install it
       now as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>mkdir -p               /usr/share/unicode/ucd &amp;&amp;
-unzip -u ../UCD.zip -d /usr/share/unicode/ucd</userinput></screen>
+<screen role="root"><userinput>mkdir -p                /usr/share/unicode/ucd &amp;&amp;
+unzip -uo ../UCD.zip -d /usr/share/unicode/ucd</userinput></screen>
 
     <note>
@@ -188,10 +171,4 @@
     <title>Command Explanations</title>
 
-<!--    <para>
-      <command>sed -ri ... data/ibus.schemas ...</command>: This sed fixes
-      deprecated entries in the gsettings schema templates installed by this
-      package.
-    </para>
--->
     <para>
       <parameter>--disable-emoji-dict</parameter>: This switch disables the 
