Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision bc9c1defc359e7c1925e3269aeb58638daff70a4)
+++ x/lib/atk.xml	(revision 1b9e36e6c779399c563254628ee37b87832b58e5)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY atk-download-http "&gnome-download-http;/atk/1.18/atk-&atk-version;.tar.bz2">
-  <!ENTITY atk-download-ftp  "&gnome-download-ftp;/atk/1.18/atk-&atk-version;.tar.bz2">
-  <!ENTITY atk-md5sum        "9fc33ec48fd32933f7f630479dfad667">
-  <!ENTITY atk-size          "655 KB">
-  <!ENTITY atk-buildsize     "10 MB">
+  <!ENTITY atk-download-http "&gnome-download-http;/atk/1.24/atk-&atk-version;.tar.bz2">
+  <!ENTITY atk-download-ftp  "&gnome-download-ftp;/atk/1.24/atk-&atk-version;.tar.bz2">
+  <!ENTITY atk-md5sum        "fb0ee9c7f18b15b490a0168b13740a4d">
+  <!ENTITY atk-size          "685 KB">
+  <!ENTITY atk-buildsize     "10.7 MB">
   <!ENTITY atk-time          "0.1 SBU">
 ]>
@@ -93,4 +93,7 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
+    <para><parameter>--disable-static</parameter>: This switch prevents the
+    static libraries from being built.</para>
+
   </sect2>
 
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision bc9c1defc359e7c1925e3269aeb58638daff70a4)
+++ x/lib/gtk+2.xml	(revision 1b9e36e6c779399c563254628ee37b87832b58e5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.10/gtk+-&gtk2-version;.tar.bz2">
-  <!ENTITY gtk2-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-&gtk2-version;.tar.bz2">
-  <!ENTITY gtk2-md5sum        "d0af87715f3b0f05bf38a3312a528012">
-  <!ENTITY gtk2-size          "15.1 MB">
-  <!ENTITY gtk2-buildsize     "240 MB (includes building the experimental backends)">
-  <!ENTITY gtk2-time          "3.1 SBU (includes building the experimental backends)">
+  <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.14/gtk+-&gtk2-version;.tar.bz2">
+  <!ENTITY gtk2-download-ftp  "ftp://ftp.gtk.org/pub/gtk/2.14/gtk+-&gtk2-version;.tar.bz2">
+  <!ENTITY gtk2-md5sum        "72bf65a54d2d29a6644dc0d28313ee67">
+  <!ENTITY gtk2-size          "16.5 MB">
+  <!ENTITY gtk2-buildsize     "285 MB">
+  <!ENTITY gtk2-time          "4.6 SBU">
 ]>
 
@@ -64,11 +64,12 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libtiff"/> and
-    <xref linkend="libjpeg"/></para>
+    <para role="recommended"><xref linkend="libtiff"/>,
+    <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">libjasper</ulink>
+    and <xref linkend="libjpeg"/></para>
 
     <para>Though not required, the GTK developers expect
-    <application>libtiff</application> and <application>libjpeg</application>
-    to be installed. Other packages also expect
-    <application>GTK+</application>-2 to be built with support for these
+    <application>libtiff</application>, <application>libjasper</application>
+    and <application>libjpeg</application> to be installed. Other packages also
+    expect <application>GTK+</application>-2 to be built with support for these
     graphics packages as well.</para>
 
@@ -95,5 +96,5 @@
     you must run the tests from a session with X Window Display capability
     (i.e., not a text-based terminal/console) as the tests attempt to open an X
-    window.</para>
+    window, and the tests can take an excessively long time.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -125,4 +126,10 @@
     don't have <application>libjpeg</application> installed.</para>
 
+    <para><option>--without-libjasper</option>: Use this switch if you
+    don't have <application>libjasper</application> installed.</para>
+
+    <para><parameter>--disable-static</parameter>: This switch prevents the
+    static libraries from being built.</para>
+
   </sect2>
 
@@ -139,5 +146,5 @@
         gtk-query-immodules-2.0, and gtk-update-icon-cache</seg>
         <seg>libgdk_pixbuf-2.0.so, libgdk-x11-2.0.so, libgtk-x11-2.0.so,
-        libgdk_pixbuf_xlib-2.0.so, and numerous engine, module, and
+        libgdk_pixbuf_xlib-2.0.so, libgailutil.so and numerous engine, module, and
         loader plugins</seg>
         <seg>/etc/gtk-2.0, /usr/include/gtk-2.0, /usr/lib/gtk-2.0,
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision bc9c1defc359e7c1925e3269aeb58638daff70a4)
+++ x/lib/pango.xml	(revision 1b9e36e6c779399c563254628ee37b87832b58e5)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY pango-download-http "&gnome-download-http;/pango/1.16/pango-&pango-version;.tar.bz2">
-  <!ENTITY pango-download-ftp  "ftp://ftp.gtk.org/pub/pango/1.16/pango-&pango-version;.tar.bz2">
-  <!ENTITY pango-md5sum        "025e2ac5e40cac163aae4653aeef559c">
-  <!ENTITY pango-size          "1.3 MB">
-  <!ENTITY pango-buildsize     "28 MB">
-  <!ENTITY pango-time          "0.8 SBU">
+  <!ENTITY pango-download-http "&gnome-download-http;/pango/1.22/pango-&pango-version;.tar.bz2">
+ <!-- everything up to 1.21 is there, but not 1.22
+  <!ENTITY pango-download-ftp  "ftp://ftp.gtk.org/pub/pango/1.22/pango-&pango-version;.tar.bz2"> -->
+  <!ENTITY pango-download-ftp  " ">
+  <!ENTITY pango-md5sum        "37a185a3cb5c1a39ade7fdc3e6c75349">
+  <!ENTITY pango-size          "1.4 MB">
+  <!ENTITY pango-buildsize     "21 MB with no static libs ( or 37MB with them, plus 1MB to run the test suite)">
+  <!ENTITY pango-time          "0.6 SBU">
 ]>
 
@@ -130,4 +132,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para><parameter>--disable-static</parameter>: This switch prevents the
+    static libraries from being built.</para>
 
   </sect2>
