Index: gnome.ent
===================================================================
--- gnome.ent	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ gnome.ent	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -17,7 +17,7 @@
 <!ENTITY yelp-xsl-version             "3.18.1">
 <!ENTITY GConf-version                "3.2.6">
-<!ENTITY geocode-glib-version         "3.16.2">
+<!ENTITY geocode-glib-version         "3.18.1">
 <!ENTITY gjs-version                  "1.45.3">
-<!ENTITY gnome-desktop-version        "3.16.2">
+<!ENTITY gnome-desktop-version        "3.18.2">
 <!ENTITY gnome-menus-version          "3.13.3">
 <!ENTITY gnome-online-accounts-version "3.16.3">
Index: gnome/platform/geocode-glib.xml
===================================================================
--- gnome/platform/geocode-glib.xml	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ gnome/platform/geocode-glib.xml	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -6,11 +6,11 @@
 
   <!ENTITY geocode-glib-download-http
-           "&gnome-download-http;/geocode-glib/&gnome-minor16;/geocode-glib-&geocode-glib-version;.tar.xz">
+           "&gnome-download-http;/geocode-glib/&gnome-minor18;/geocode-glib-&geocode-glib-version;.tar.xz">
   <!ENTITY geocode-glib-download-ftp
-           "&gnome-download-ftp;/geocode-glib/&gnome-minor16;/geocode-glib-&geocode-glib-version;.tar.xz">
-  <!ENTITY geocode-glib-md5sum        "c309e8e9168b90c5b7df060d45ea135b">
-  <!ENTITY geocode-glib-size          "348 KB">
-  <!ENTITY geocode-glib-buildsize     "20 MB">
-  <!ENTITY geocode-glib-time          "0.1 SBU">
+           "&gnome-download-ftp;/geocode-glib/&gnome-minor18;/geocode-glib-&geocode-glib-version;.tar.xz">
+  <!ENTITY geocode-glib-md5sum        "1d294d59bfc05027ccb9ff6708b63491">
+  <!ENTITY geocode-glib-size          "360 KB">
+  <!ENTITY geocode-glib-buildsize     "5.8 MB">
+  <!ENTITY geocode-glib-time          "0.2 SBU">
 ]>
 
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,4 +75,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/geocode-glib-&geocode-glib-version;-fix_icon_installation-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Geocode GLib Dependencies</bridgehead>
 
@@ -102,4 +112,10 @@
 
     <para>
+      First, apply a patch to fix the Makefile to not complain about nonexistent icons.
+    </para>
+
+<screen><userinput>patch -Np1 -i ../geocode-glib-&geocode-glib-version;-fix_icon_installation-1.patch</userinput></screen>
+
+    <para>
       Install <application>Geocode GLib</application> by running the following
       commands:
@@ -109,7 +125,13 @@
 make</userinput></screen>
 
+<!--
     <para>
       To test the results, issue: <command>make -k check</command>. Note that
       at least one test is known to fail for unknown reasons.
+    </para> -->
+<!-- The test suite is broken as of 3.18.1, one test fails and crashes the entire build -->
+
+    <para>
+      This package does not come with a working test suite.
     </para>
 
@@ -135,5 +157,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome/platform/gnome-desktop.xml
===================================================================
--- gnome/platform/gnome-desktop.xml	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ gnome/platform/gnome-desktop.xml	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -6,8 +6,8 @@
 
 <!ENTITY gnome-desktop-download-http
-           "&gnome-download-http;/gnome-desktop/&gnome-minor16;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+           "&gnome-download-http;/gnome-desktop/&gnome-minor18;/gnome-desktop-&gnome-desktop-version;.tar.xz">
   <!ENTITY gnome-desktop-download-ftp
-           "&gnome-download-ftp;/gnome-desktop/&gnome-minor16;/gnome-desktop-&gnome-desktop-version;.tar.xz">
-  <!ENTITY gnome-desktop-md5sum        "ab5bf4cc94ad63639f42adcc1542b1f0">
+           "&gnome-download-ftp;/gnome-desktop/&gnome-minor18;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-md5sum        "9a5875247abdb99bad93f1c4230d1d6d">
   <!ENTITY gnome-desktop-size          "1.0 MB">
   <!ENTITY gnome-desktop-buildsize     "24 MB">
Index: gnome/platform/gnome-menus.xml
===================================================================
--- gnome/platform/gnome-menus.xml	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ gnome/platform/gnome-menus.xml	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -42,5 +42,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/telepathy/telepathy-glib.xml
===================================================================
--- gnome/telepathy/telepathy-glib.xml	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ gnome/telepathy/telepathy-glib.xml	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +102,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Telepathy GLlib</title>
+    <title>Installation of Telepathy Glib</title>
 
     <para>
@@ -115,5 +115,8 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make -k check</command>.
+      Four tests are known to fail: <emphasis>test-account</emphasis>, 
+      <emphasis>test-cm</emphasis>, <emphasis>test-contact-lists</emphasis>, and
+      <emphasis>test-contact-list-client</emphasis>.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ introduction/welcome/changelog.xml	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -48,4 +48,10 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to gnome-desktop-3.18.2.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to geocode-glib-3.18.1.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Use LFS D-Bus version.</para>
         </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 6eb1db5d6d41b0a5c28d4a726afbbebb279e3347)
+++ packages.ent	(revision cc1e2d256bc6ac7d3ac0fd02175d8cedd5e4bb3b)
@@ -527,5 +527,5 @@
 <!ENTITY libxklavier-version          "5.4">
 <!ENTITY pango-version                "1.38.0">
-<!ENTITY pangomm-version              "2.36.0">
+<!ENTITY pangomm-version              "2.38.1">
 <!ENTITY qt4-version                  "4.8.7">
 <!ENTITY qt5-version                  "5.5.1">
