Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/evolution.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-36;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-36;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "600368015f20cc256c2f1a94e60ed455">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-38;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-38;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "afa3559b484d616a3c33858692dea431">
   <!ENTITY evolution-size          "12 MB">
   <!ENTITY evolution-buildsize     "342 MB">
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/file-roller.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,9 +6,9 @@
 
   <!ENTITY file-roller-download-http
-           "&gnome-download-http;/file-roller/&gnome-minor-36;/file-roller-&file-roller-version;.tar.xz">
+           "&gnome-download-http;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
   <!ENTITY file-roller-download-ftp
-           "&gnome-download-ftp;/file-roller/&gnome-minor-36;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "1cadd4b42837d848e5d2da191f4112d6">
-  <!ENTITY file-roller-size          "850 KB">
+           "&gnome-download-ftp;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "41ee373818d577659980dcdaf57b772a">
+  <!ENTITY file-roller-size          "860 KB">
   <!ENTITY file-roller-buildsize     "25 MB">
   <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-calculator.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-minor-36;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+           "&gnome-download-http;/gnome-calculator/&gnome-minor-38;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-36;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "71854fb58671b4a88ac990e2f2439e4f">
-  <!ENTITY gnome-calculator-size          "964 KB">
+           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-38;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "1fadcd71b55963324cc5cc2ee8543131">
+  <!ENTITY gnome-calculator-size          "984 KB">
   <!ENTITY gnome-calculator-buildsize     "53 MB (with tests)">
   <!ENTITY gnome-calculator-time          "0.3 SBU (with tests)">
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-disk-utility.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-36;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-38;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
   <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-36;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "202e8f4aeb216c4f5b501e4b1b232be2">
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-38;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "d5d7d3f31e13fd88959069f3bec9e69d">
   <!ENTITY gnome-disk-utility-size          "1.3 MB">
   <!ENTITY gnome-disk-utility-buildsize     "36 MB">
-  <!ENTITY gnome-disk-utility-time          "0.1 SBU (Using parallelism=4)">
+  <!ENTITY gnome-disk-utility-time          "0.1 SBU (with parallelism=4)">
 ]>
 
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-maps.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-maps-download-http
-           "&gnome-download-http;/gnome-maps/&gnome-minor-36;/gnome-maps-&gnome-maps-version;.tar.xz">
+           "&gnome-download-http;/gnome-maps/&gnome-minor-38;/gnome-maps-&gnome-maps-version;.tar.xz">
   <!ENTITY gnome-maps-download-ftp
-           "&gnome-download-ftp;/gnome-maps/&gnome-minor-36;/gnome-maps-&gnome-maps-version;.tar.xz">
-  <!ENTITY gnome-maps-md5sum        "aa82dbb45fa8c0ee0c6254f0065bdab2">
+           "&gnome-download-ftp;/gnome-maps/&gnome-minor-38;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-md5sum        "c89473632e863a7d9bfa78eda0771c11">
   <!ENTITY gnome-maps-size          "3.8 MB">
-  <!ENTITY gnome-maps-buildsize     "16 MB">
+  <!ENTITY gnome-maps-buildsize     "17 MB">
   <!ENTITY gnome-maps-time          "0.1 SBU">
 ]>
Index: gnome/applications/gnome-nettool.xml
===================================================================
--- gnome/applications/gnome-nettool.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-nettool.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -74,4 +74,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gnome-nettool-&gnome-nettool-version;-ping_and_netstat_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GNOME Nettool Dependencies</bridgehead>
 
@@ -101,11 +111,17 @@
 
     <para>
+      First, adapt <application>GNOME Nettool</application> to changes in the
+      <application>ping</application>, <application>ping6</application>, and
+      <application>netstat</application> utilities:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../gnome-nettool-&gnome-nettool-version;-ping_and_netstat_fixes-1.patch</userinput></screen>
+
+    <para>
       Install <application>GNOME Nettool</application> by running
       the following commands:
     </para>
 
-<screen><userinput>sed -i 's/%s ping/%s/' src/ping.h &amp;&amp;
-sed -i '27 s/%s6/%s /' src/ping.h &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-screenshot.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-minor-36;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+           "&gnome-download-http;/gnome-screenshot/&gnome-minor-38;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
   <!ENTITY gnome-screenshot-download-ftp
-           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-36;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-md5sum        "27fb11f693fa7bd2d10df636f5ba1c5e">
-  <!ENTITY gnome-screenshot-size          "228 KB">
-  <!ENTITY gnome-screenshot-buildsize     "6.5 MB">
+           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-38;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+  <!ENTITY gnome-screenshot-md5sum        "6550491108355c9d991e90b735ef3908">
+  <!ENTITY gnome-screenshot-size          "352 KB">
+  <!ENTITY gnome-screenshot-buildsize     "6.6 MB">
   <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
 ]>
@@ -78,6 +78,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libcanberra"/> (Compiled with GTK+3 support).
+      <xref linkend="gtk3"/>,
+      <xref linkend="libcanberra"/> (Compiled with GTK+3 support). and
+      <xref linkend="libhandy1"/>
     </para>
 
@@ -114,5 +115,5 @@
       <para>
         In order to best run <application>GNOME Screenshot</application>
-        from the command line, the --interactive option needs to be specified.
+        from the command line, the -i option needs to be specified.
       </para>
     </note>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-system-monitor.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-system-monitor-download-http
-      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-36;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+           "&gnome-download-http;/gnome-system-monitor/&gnome-minor-38;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-36;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "b1443ab12c3b7bcca940d28754e5b948">
-  <!ENTITY gnome-system-monitor-size          "689 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "31 MB">
-  <!ENTITY gnome-system-monitor-time          "0.2 SBU (parallelism=4)">
+           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-38;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "0494ca62d2d59b5de5efc2eddef58463">
+  <!ENTITY gnome-system-monitor-size          "696 KB">
+  <!ENTITY gnome-system-monitor-buildsize     "32 MB">
+  <!ENTITY gnome-system-monitor-time          "0.2 SBU (with parallelism=4)">
 ]>
 
@@ -155,5 +155,5 @@
         </seg>
         <seg>
-          /usr/{libexec, share, share/help/*}/gnome-system-monitor
+          /usr/{libexec,share,share/help/*}/gnome-system-monitor
         </seg>
       </seglistitem>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision 5468eaa9f2bd2582c3d80e46aecc7d8a7b506d4e)
+++ gnome/applications/gnome-terminal.xml	(revision 279fc64ecdb89e74559387b1bf55ab14dfed77ae)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/&gnome-minor-36;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+           "&gnome-download-http;/gnome-terminal/&gnome-minor-38;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-36;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "08150cbf2e23dd4f60f959a6eca8ef0c">
+           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-38;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "8e131d6c4eca8843bec9421e43191790">
   <!ENTITY gnome-terminal-size          "2.4 MB">
-  <!ENTITY gnome-terminal-buildsize     "46 MB">
+  <!ENTITY gnome-terminal-buildsize     "47 MB">
   <!ENTITY gnome-terminal-time          "0.1 SBU (using parallelism=4)">
 ]>
