diff --git a/general.ent b/general.ent
index 6e372cdc0c..faf32713dc 100644
--- a/general.ent
+++ b/general.ent
@@ -368,7 +368,7 @@
 <!ENTITY cairo-version                "1.0.4">
 <!ENTITY pango-version                "1.12.3">
 <!ENTITY atk-version                  "1.11.4">
-<!ENTITY gtk2-version                 "2.8.17">
+<!ENTITY gtk2-version                 "2.8.18">
 <!ENTITY lesstif-version              "0.94.4">
 <!ENTITY startup-notification-version "0.8">
 <!ENTITY libwnck-version              "2.12.2">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d4af2a5613..93517c552f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>May 27th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Gtk+-2.8.18.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to Pango-1.12.3.</para>
         </listitem>
@@ -57,8 +60,8 @@
       <para>May 26th, 2006</para>
       <itemizedlist>
         <listitem>
-          <para>[manuel] - Made all dependencies on a mail server an
-          actual cross-reference.</para>
+          <para>[manuel] - Made all dependencies on a mail server
+          actual cross-references.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/x/lib/gtk+2.xml b/x/lib/gtk+2.xml
index f6683e035d..dfb00604bf 100644
--- a/x/lib/gtk+2.xml
+++ b/x/lib/gtk+2.xml
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.8/gtk+-&gtk2-version;.tar.bz2">
-  <!ENTITY gtk2-download-ftp  "&gnome-download-ftp;/gtk+/2.8/gtk+-&gtk2-version;.tar.bz2">
-  <!ENTITY gtk2-md5sum        "6d2deb63a5444808d2aeb7dcfffaa2f4">
+  <!ENTITY gtk2-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-&gtk2-version;.tar.bz2">
+  <!ENTITY gtk2-md5sum        "0d27a026428732337676d47d22e5e23c">
   <!ENTITY gtk2-size          "12.2 MB">
-  <!ENTITY gtk2-buildsize     "195 MB">
-  <!ENTITY gtk2-time          "2.7 SBU">
+  <!ENTITY gtk2-buildsize     "198 MB">
+  <!ENTITY gtk2-time          "2.6 SBU">
 ]>
 
 <sect1 id="gtk2" xreflabel="GTK+-&gtk2-version;">