Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/gtk+3.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -7,8 +7,8 @@
   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "b4d4d30d90f4831855b410fb6a1fae63">
-  <!ENTITY gtk3-size          "18 MB">
-  <!ENTITY gtk3-buildsize     "503 MB (add 10 MB for tests)">
-  <!ENTITY gtk3-time          "11 SBU (add 0.8 SBU for tests)">
+  <!ENTITY gtk3-md5sum        "230fd78e42419d35ff790784b457e5f2">
+  <!ENTITY gtk3-size          "19 MB">
+  <!ENTITY gtk3-buildsize     "512 MB (with tests)">
+  <!ENTITY gtk3-time          "7.3 SBU (with tests)">
 ]>
 
@@ -258,11 +258,12 @@
       <seglistitem>
         <seg>
-          broadwayd, 
-          gtk3-demo, 
-          gtk3-demo-application, 
-          gtk3-icon-browser, 
-          gtk3-widget-factory, 
-          gtk-encode-symbolic-svg, 
-          gtk-launch, 
+          broadwayd,
+          gtk3-demo,
+          gtk3-demo-application,
+          gtk3-icon-browser,
+          gtk3-widget-factory,
+          gtk-builder-tool,
+          gtk-encode-symbolic-svg,
+          gtk-launch,
           gtk-query-immodules-3.0, and
           gtk-update-icon-cache
@@ -275,5 +276,5 @@
           /etc/gtk-3.0,
           /usr/include/{gail,gtk}-3.0,
-          /usr/{lib,share}/gtk-3.0, 
+          /usr/{lib,share}/gtk-3.0,
           /usr/share/gtk-doc/html/{gail-libgail-util3,gdk3,gtk3}, and
           /usr/share/themes/{Default,Emacs}/gtk-3.0
@@ -301,4 +302,67 @@
       </varlistentry>
 
+      <varlistentry id="gtk3-demo">
+        <term><command>gtk3-demo</command></term>
+        <listitem>
+          <para>
+            is a simple program that demonstrates some of the things that can be
+            done with <application>GTK+ 3</application>
+          </para>
+          <indexterm zone="gtk3 gtk3-demo">
+            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-demo-application">
+        <term><command>gtk3-demo-application</command></term>
+        <listitem>
+          <para>
+            is a simple <application>GTK+ 3</application> application.
+          </para>
+          <indexterm zone="gtk3 gtk3-demo-application">
+            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-icon-browser">
+        <term><command>gtk3-icon-browser</command></term>
+        <listitem>
+          <para>
+            is a utility to explore the icons in the current icon theme. It
+            shows icons in various sizes, their symbolic variants where
+            available, as well as a description of the icon and its context.
+          </para>
+          <indexterm zone="gtk3 gtk3-icon-browser">
+            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-widget-factory">
+        <term><command>gtk3-widget-factory</command></term>
+        <listitem>
+          <para>
+            is a program to view <application>GTK+ 3</application> themes and widgets.
+          </para>
+          <indexterm zone="gtk3 gtk3-widget-factory">
+            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk-builder-tool">
+        <term><command>gtk-builder-tool</command></term>
+        <listitem>
+          <para>
+            can perform various operations on GtkBuilder .ui files.
+          </para>
+          <indexterm zone="gtk3 gtk-builder-tool">
+            <primary sortas="b-gtk-builder-tool">gtk-builder-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gtk-encode-symbolic-svg">
         <term><command>gtk-encode-symbolic-svg</command></term>
@@ -357,55 +421,4 @@
       </varlistentry>
 
-      <varlistentry id="gtk3-demo">
-        <term><command>gtk3-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the things that can be
-            done with <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk3-demo">
-            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo-application">
-        <term><command>gtk3-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple <application>GTK+ 3</application> application.
-          </para>
-          <indexterm zone="gtk3 gtk3-demo-application">
-            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-icon-browser">
-        <term><command>gtk3-icon-browser</command></term>
-        <listitem>
-          <para>
-            is a utility to explore the icons in the current icon theme. It
-            shows icons in various sizes, their symbolic variants where
-            available, as well as a description of the icon and its context.
-          </para>
-          <indexterm zone="gtk3 gtk3-icon-browser">
-            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-widget-factory">
-        <term><command>gtk3-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view <application>GTK+ 3</application> themes and widgets.
-          </para>
-          <indexterm zone="gtk3 gtk3-widget-factory">
-            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libgailutil-3">
         <term><filename class="libraryfile">libgailutil-3.so</filename></term>
