Index: gnome/applications/baobab.xml
===================================================================
--- gnome/applications/baobab.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/baobab.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-minor-16;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-minor-16;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-md5sum        "e70b4b79ff18d6984b5d04faa2f63b35">
-  <!ENTITY baobab-size          "860 KB">
+  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-minor-18;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-minor-18;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-md5sum        "299cc7e2ebbdde1813453074c88aa6de">
+  <!ENTITY baobab-size          "299cc7e2ebbdde1813453074c88aa6de KB">
   <!ENTITY baobab-buildsize     "15 MB">
   <!ENTITY baobab-time          "0.1 SBU">
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/cheese.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY cheese-download-http "&gnome-download-http;/cheese/&gnome-minor-16;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/&gnome-minor-16;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-md5sum        "e18b0742aa190d4c3110bd427c6b7a50">
+  <!ENTITY cheese-download-http "&gnome-download-http;/cheese/&gnome-minor-18;/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/&gnome-minor-18;/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-md5sum        "a1f646780ad858ea6897cbd1bc7d4bbe">
   <!ENTITY cheese-size          "1.8 MB">
   <!ENTITY cheese-buildsize     "27 MB">
@@ -70,5 +70,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,5 +79,5 @@
        </para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">Cheese Dependencies</bridgehead>
@@ -132,5 +132,5 @@
       </indexterm>
   </sect2>
- 
+
   <sect2 role="installation">
     <title>Installation of Cheese</title>
@@ -140,8 +140,8 @@
       commands:
     </para>
-
-<screen><userinput>patch -Np1 -i ../cheese-&cheese-version;-clutter_gst_3.0-1.patch &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
+<!--
+<screen><userinput>patch -Np1 -i ../cheese-&cheese-version;-clutter_gst_3.0-1.patch &amp;&amp;-->
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -185,7 +185,5 @@
         </seg>
         <seg>
-          /usr/include/cheese,
-          /usr/share/gtk-doc/html/cheese, and
-          /usr/share/help/*/cheese
+          /usr/{include,share/gtk-doc/html,share/help/*}/cheese
         </seg>
       </seglistitem>
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/eog.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-16;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-16;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "59368997cbe700fa8e2bfcea2175f812">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-18;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-18;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "939f44849267c33a9df131e80fcbd0e7">
   <!ENTITY eog-size          "4.2 MB">
   <!ENTITY eog-buildsize     "55 MB">
@@ -151,5 +151,5 @@
         <seg>
           /usr/include/eog-3.0 and
-          /usr/{lib,share{,/gtk-doc/html,/help/*}}/eog
+          /usr/{lib,share,share/gtk-doc/html,share/help/*}/eog
         </seg>
       </seglistitem>
Index: gnome/applications/epiphany.xml
===================================================================
--- gnome/applications/epiphany.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/epiphany.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -6,11 +6,11 @@
 
   <!ENTITY epiphany-download-http
-           "&gnome-download-http;/epiphany/&gnome-minor-16;/epiphany-&epiphany-version;.tar.xz">
+           "&gnome-download-http;/epiphany/&gnome-minor-18;/epiphany-&epiphany-version;.tar.xz">
   <!ENTITY epiphany-download-ftp
-           "&gnome-download-ftp;/epiphany/&gnome-minor-16;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "3296af4532b8019775f4b40d21a341ae">
-  <!ENTITY epiphany-size          "2.9 MB">
-  <!ENTITY epiphany-buildsize     "91 MB">
-  <!ENTITY epiphany-time          "0.6 SBU">
+           "&gnome-download-ftp;/epiphany/&gnome-minor-18;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "706d1c649c905f6b46a4867c3946e339">
+  <!ENTITY epiphany-size          "3 MB">
+  <!ENTITY epiphany-buildsize     "68 MB (with tests)">
+  <!ENTITY epiphany-time          "0.6 SBU (with tests)">
 ]>
 
@@ -119,12 +119,20 @@
 
     <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      An already active graphical session with bus address is necessary
+      to execute the test suite. The <quote>test-ephy-download</quote>
+      needs a GNOME session, otherwise, it fails. To test the results,
+      removing the failing <quote>test-ephy-download</quote>, issue:
+    </para>
+
+<screen><userinput>sed -e 's/ephy-download$(EXEEXT) test-//' \
+    -i tests/Makefile &amp;&amp;
+
+make check</userinput></screen>
 
   </sect2>
@@ -146,7 +154,5 @@
         </seg>
         <seg>
-          /usr/lib/epiphany,
-          /usr/share/epiphany, and
-          /usr/share/help/*/epiphany
+          /usr/{lib,share,share/help/*}/epiphany
         </seg>
       </seglistitem>
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/evince.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY evince-download-http 
-     "&gnome-download-http;/evince/&gnome-minor-16;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-download-ftp  
-     "&gnome-download-ftp;/evince/&gnome-minor-16;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "6a5e4aa41d7026eb477290416d9f2a5b">
-  <!ENTITY evince-size          "3 MB">
-  <!ENTITY evince-buildsize     "90 MB">
-  <!ENTITY evince-time          "1 SBU">
+  <!ENTITY evince-download-http
+     "&gnome-download-http;/evince/&gnome-minor-18;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-download-ftp
+     "&gnome-download-ftp;/evince/&gnome-minor-18;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "388a813d7d30f1f778f7993efd7f3a40">
+  <!ENTITY evince-size          "3.1 MB">
+  <!ENTITY evince-buildsize     "92 MB">
+  <!ENTITY evince-time          "1.1 SBU">
 ]>
 
@@ -82,10 +82,12 @@
       <xref linkend="adwaita-icon-theme"/>,
       <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="itstool"/>
+      <xref linkend="gtk3"/>,
+      <xref linkend="itstool"/>, and
+      <xref linkend="libxml2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="gnome-keyring"/>,
       <xref linkend="gobject-introspection"/>,
       <xref linkend="libsecret"/>,
@@ -96,5 +98,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="gst10-plugins-base"/>,
       <xref linkend="gtk-doc"/>,
+      <xref linkend="libtiff"/>,
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
       <ulink url="http://djvu.sourceforge.net/">DjVuLibre</ulink>,
@@ -138,5 +143,5 @@
 
     <para>
-      <option>--enable-introspection</option>: By default, the
+      <parameter>--enable-introspection</parameter>: By default, the
       <application>Gobject Introspection</application> support is
       turned off, even though that package is an expected component
@@ -147,4 +152,13 @@
       href="../../xincludes/static-libraries.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para>
+      <option>--disable-nautilus</option>: This switch disables building
+      of the <application>Nautilus</application> Plugin. Use this switch
+      if <application>Nautilus</application> is not installed.
+    </para>
+
     <para>
       <option>--without-keyring</option>: This switch disables use of
@@ -152,13 +166,4 @@
       if <application>libsecret</application> is not installed.
     </para>
-
-    <para>
-      <option>--disable-nautilus</option>: This switch disables building
-      of the <application>Nautilus</application> Plugin. Use this switch
-      if <application>Nautilus</application> is not installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
Index: gnome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/gedit.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-16;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-16;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "23c67110f2be200c304b31ef833b5a27">
-  <!ENTITY gedit-size          "2.8 MB">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-18;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-18;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "a61007048db22d0d55a41b5fa3c984f8">
+  <!ENTITY gedit-size          "2.9 MB">
   <!ENTITY gedit-buildsize     "94 MB">
   <!ENTITY gedit-time          "0.9 SBU">
@@ -158,5 +158,5 @@
         <seg>
           /usr/include/gedit-3.14 and
-          /usr/{lib,libexec,share{,/gtk-doc/html,/help/*}}/gedit
+          /usr/{lib,libexec,share,share/gtk-doc/html,share/help/*}/gedit
         </seg>
       </seglistitem>
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/gnome-calculator.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-minor-16;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+           "&gnome-download-http;/gnome-calculator/&gnome-minor-18;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-16;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "3756f5f782c008b9b4e612a0d517f834">
-  <!ENTITY gnome-calculator-size          "1.4 MB">
-  <!ENTITY gnome-calculator-buildsize     "56 MB">
-  <!ENTITY gnome-calculator-time          "0.3 SBU">
+           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-18;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "81e2b89bc9ede02bc114a114a7213c9a">
+  <!ENTITY gnome-calculator-size          "1.3 MB">
+  <!ENTITY gnome-calculator-buildsize     "48 MB (with tests)">
+  <!ENTITY gnome-calculator-time          "0.4 SBU (with tests)">
 ]>
 
@@ -101,5 +101,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -107,5 +107,5 @@
       To test the results, issue: <command>make check</command>. In 32bit
       systems, Number.float and Number.double tests might fail due to floating
-      point round off errors.
+      point round off errors, most probably in 32 bit systems.
     </para>
 
@@ -118,4 +118,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanation</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -123,5 +131,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -131,8 +139,8 @@
         </seg>
         <seg>
-          None
+          libcalculator.so
         </seg>
         <seg>
-          /usr/share/help/*/gnome-calculator
+          /usr/lib/gnome-calculator and /usr/share/help/*/gnome-calculator
         </seg>
       </seglistitem>
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/gnome-screenshot.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-minor-16;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+           "&gnome-download-http;/gnome-screenshot/&gnome-minor-18;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
   <!ENTITY gnome-screenshot-download-ftp
-           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-16;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-md5sum        "8f67ae3b0746dab15e417f64a4d7fd13">
+           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-18;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+  <!ENTITY gnome-screenshot-md5sum        "6e52dd69ada4a2f37923944f34bf7851">
   <!ENTITY gnome-screenshot-size          "276 KB">
   <!ENTITY gnome-screenshot-buildsize     "7.4 MB">
-  <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
+  <!ENTITY gnome-screenshot-time          "0.1 SBU">
 ]>
 
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/gnome-system-monitor.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-system-monitor-download-http
-      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-16;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-18;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-16;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "8c9dcf6bf26d7c8d531e646f0b714bdc">
-  <!ENTITY gnome-system-monitor-size          "836 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "27 MB">
-  <!ENTITY gnome-system-monitor-time          "0.4 SBU">
+           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-18;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "391f8e516d940f355902e47af5d6be61">
+  <!ENTITY gnome-system-monitor-size          "852 KB">
+  <!ENTITY gnome-system-monitor-buildsize     "35 MB">
+  <!ENTITY gnome-system-monitor-time          "0.6 SBU">
 ]>
 
@@ -150,6 +150,5 @@
         </seg>
         <seg>
-          /usr/libexec/gnome-system-monitor and
-          /usr/share/help/*/gnome-system-monitor
+          /usr/{libexec,share/help/*}/gnome-system-monitor
         </seg>
       </seglistitem>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/gnome-terminal.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/&gnome-minor-16;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+           "&gnome-download-http;/gnome-terminal/&gnome-minor-18;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-16;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "17d15e7d226826ca1853eee1c99645b0">
+           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-18;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "81a8fb9ef56b963c7db55e5624d4561e">
   <!ENTITY gnome-terminal-size          "1.8 MB">
-  <!ENTITY gnome-terminal-buildsize     "44 MB">
+  <!ENTITY gnome-terminal-buildsize     "45 MB">
   <!ENTITY gnome-terminal-time          "0.3 SBU">
 ]>
@@ -124,5 +124,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <note><para>To run <application>GNOME Terminal</application>, the 
+    <note><para>To run <application>GNOME Terminal</application>, the
     environment variable <envar>LANG></envar> must be set to a UTF-8
     locale.</para></note>
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/gucharmap.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -6,10 +6,10 @@
 
   <!ENTITY gucharmap-download-http
-       "&gnome-download-http;/gucharmap/&gnome-minor-16;/gucharmap-&gucharmap-version;.tar.xz">
+       "&gnome-download-http;/gucharmap/&gnome-minor-18;/gucharmap-&gucharmap-version;.tar.xz">
   <!ENTITY gucharmap-download-ftp
-       "&gnome-download-ftp;/gucharmap/&gnome-minor-16;/gucharmap-&gucharmap-version;.tar.xz">
-  <!ENTITY gucharmap-md5sum        "54d58a61c8c22e6ecf5bb33793272f47">
+       "&gnome-download-ftp;/gucharmap/&gnome-minor-18;/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-md5sum        "086939aebd9d146f6d773d0fed1b6b7f">
   <!ENTITY gucharmap-size          "2 MB">
-  <!ENTITY gucharmap-buildsize     "42 MB">
+  <!ENTITY gucharmap-buildsize     "43 MB">
   <!ENTITY gucharmap-time          "0.2 SBU">
 ]>
@@ -80,5 +80,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="desktop-file-utils"/>, 
+      <xref linkend="desktop-file-utils"/>,
       <xref linkend="gtk3"/> and
       <xref linkend="itstool"/>
Index: gnome/applications/nautilus.xml
===================================================================
--- gnome/applications/nautilus.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/nautilus.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY nautilus-download-http 
-           "&gnome-download-http;/nautilus/&gnome-minor-16;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-download-ftp  
-           "&gnome-download-ftp;/nautilus/&gnome-minor-16;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-md5sum        "4a5c73bac8e26a883684b591b380f930">
-  <!ENTITY nautilus-size          "3.2 MB">
-  <!ENTITY nautilus-buildsize     "119 MB">
-  <!ENTITY nautilus-time          "0.6 SBU">
+  <!ENTITY nautilus-download-http
+           "&gnome-download-http;/nautilus/&gnome-minor-18;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-download-ftp
+           "&gnome-download-ftp;/nautilus/&gnome-minor-18;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-md5sum        "6310ec9802e829842dd0cb87cfeaaad6">
+  <!ENTITY nautilus-size          "3.3 MB">
+  <!ENTITY nautilus-buildsize     "115 MB">
+  <!ENTITY nautilus-time          "0.8 SBU">
 ]>
 
@@ -120,5 +120,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
@@ -175,7 +175,5 @@
       <seglistitem>
         <seg>
-          nautilus, 
-          nautilus-autorun-software,  and
-          nautilus-connect-server
+          nautilus and nautilus-autorun-software
         </seg>
         <seg>
@@ -183,8 +181,6 @@
         </seg>
         <seg>
-          /usr/include/nautilus,
-          /usr/lib/nautilus,
-          /usr/share/gnome-shell/search-providers, and
-          /usr/share/gtk-doc/html/libnautilus-extension
+          /usr/{include,lib}/nautilus and
+          /usr/share/{gnome-shell/search-providers,gtk-doc/html/libnautilus-extension}
         </seg>
       </seglistitem>
Index: gnome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision a7035bb711d85b338d99968462b3a193b30a2c47)
+++ gnome/applications/seahorse.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY seahorse-download-http 
-           "&gnome-download-http;/seahorse/&gnome-minor-16;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-download-ftp  
-           "&gnome-download-ftp;/seahorse/&gnome-minor-16;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-md5sum        "3416abb33183285a5e69fe0a058c39de">
+  <!ENTITY seahorse-download-http
+           "&gnome-download-http;/seahorse/&gnome-minor-18;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-download-ftp
+           "&gnome-download-ftp;/seahorse/&gnome-minor-18;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-md5sum        "758204ac248e1fb3b3767ce84d2795b4">
   <!ENTITY seahorse-size          "1.5 MB">
-  <!ENTITY seahorse-buildsize     "51 MB">
+  <!ENTITY seahorse-buildsize     "54 MB">
   <!ENTITY seahorse-time          "0.3 SBU">
 ]>
@@ -147,7 +147,5 @@
         </seg>
         <seg>
-          /usr/lib/seahorse,
-          /usr/share/help/*/seahorse, and
-          /usr/share/seahorse
+          /usr/{lib,share,share/help/*}/seahorse
         </seg>
       </seglistitem>
