Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ general/genutils/highlight.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -7,6 +7,6 @@
   <!ENTITY highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
   <!ENTITY highlight-download-ftp  " ">
-  <!ENTITY highlight-md5sum        "6d09149519e6dc7981c1fdf340e16165">
-  <!ENTITY highlight-size          "616 KB">
+  <!ENTITY highlight-md5sum        "a5d0fd9d9fdf98630abaf53a1288dd00">
+  <!ENTITY highlight-size          "608 KB">
   <!ENTITY highlight-buildsize     "15 MB (without API docs)">
   <!ENTITY highlight-time          "0.6 SBU (without API docs)">
@@ -158,5 +158,5 @@
         </seg>
         <seg>
-          /etc/highlight
+          /etc/highlight,
           /usr/share/doc/highlight, and
           /usr/share/highlight
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome.ent	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -64,5 +64,5 @@
 <!ENTITY gnome-session-version             "3.22.0">
 <!ENTITY gdm-version                       "3.22.0">
-<!ENTITY gnome-user-docs-version           "3.20.2">
+<!ENTITY gnome-user-docs-version           "3.22.0">
 <!ENTITY adwaita-icon-theme-version        "3.22.0">
 <!ENTITY gnome-icon-theme-version          "3.12.0">
@@ -70,5 +70,5 @@
 <!ENTITY gnome-icon-theme-symbolic-version "3.12.0">
 <!ENTITY gnome-themes-standard-version     "3.20.2">
-<!ENTITY yelp-version                      "3.20.1">
+<!ENTITY yelp-version                      "3.22.0">
 <!ENTITY notification-daemon-version       "3.20.0">
 <!ENTITY polkit-gnome-version              "0.105">
@@ -76,11 +76,11 @@
 <!-- Chapter 31 -->
 <!-- Applications -->
-<!ENTITY baobab-version                 "3.20.1">
+<!ENTITY baobab-version                 "3.22.0">
 <!ENTITY brasero-version                "3.12.1">
 <!ENTITY cheese-version                 "3.22.0">
 <!ENTITY eog-version                    "3.20.4">
-<!ENTITY epiphany-version               "3.20.3">
-<!ENTITY evince-version                 "3.20.1">
-<!ENTITY evolution-version              "3.20.5">
+<!ENTITY epiphany-version               "3.22.0">
+<!ENTITY evince-version                 "3.22.0">
+<!ENTITY evolution-version              "3.22.0">
 <!ENTITY file-roller-version            "3.20.3">
 <!ENTITY gedit-version                  "3.20.2">
@@ -95,5 +95,5 @@
 <!ENTITY gnome-system-monitor-version   "3.20.1">
 <!ENTITY gnome-terminal-version         "3.22.0">
-<!ENTITY gnome-tweak-tool-version       "3.20.1">
+<!ENTITY gnome-tweak-tool-version       "3.22.0">
 <!ENTITY gnome-weather-version          "3.20.2">
 <!ENTITY gucharmap-version              "9.0.0">
Index: gnome/applications/baobab.xml
===================================================================
--- gnome/applications/baobab.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/applications/baobab.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-minor-20;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-minor-20;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-md5sum        "c7f2b76f6818282fe53993697089c57b">
-  <!ENTITY baobab-size          "868 KB">
-  <!ENTITY baobab-buildsize     "11 MB">
+  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-minor-22;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-minor-22;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-md5sum        "51febd8d30a9c417871d69933f2c40f2">
+  <!ENTITY baobab-size          "924 KB">
+  <!ENTITY baobab-buildsize     "14 MB">
   <!ENTITY baobab-time          "0.1 SBU">
 ]>
Index: gnome/applications/epiphany.xml
===================================================================
--- gnome/applications/epiphany.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/applications/epiphany.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -6,11 +6,11 @@
 
   <!ENTITY epiphany-download-http
-           "&gnome-download-http;/epiphany/&gnome-minor-20;/epiphany-&epiphany-version;.tar.xz">
+           "&gnome-download-http;/epiphany/&gnome-minor-22;/epiphany-&epiphany-version;.tar.xz">
   <!ENTITY epiphany-download-ftp
-           "&gnome-download-ftp;/epiphany/&gnome-minor-20;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "31822b6b199f724f212ae9200bc055f1">
-  <!ENTITY epiphany-size          "2.1 MB">
-  <!ENTITY epiphany-buildsize     "63 MB"> 
-  <!ENTITY epiphany-time          "0.9 SBU"> 
+           "&gnome-download-ftp;/epiphany/&gnome-minor-22;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "8cc2aaca0d4571d8a09f0d7d86fe6517">
+  <!ENTITY epiphany-size          "2.2 MB">
+  <!ENTITY epiphany-buildsize     "64 MB"> 
+  <!ENTITY epiphany-time          "0.8 SBU"> 
 ]>
 
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/applications/evince.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -6,11 +6,11 @@
 
   <!ENTITY evince-download-http
-     "&gnome-download-http;/evince/&gnome-minor-20;/evince-&evince-version;.tar.xz">
+     "&gnome-download-http;/evince/&gnome-minor-22;/evince-&evince-version;.tar.xz">
   <!ENTITY evince-download-ftp
-     "&gnome-download-ftp;/evince/&gnome-minor-20;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "eb05ece124d93d057211643b7ebdb145">
+     "&gnome-download-ftp;/evince/&gnome-minor-22;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "516d6786f7dbcf7c2e7838cea5fa39e9">
   <!ENTITY evince-size          "3.2 MB">
-  <!ENTITY evince-buildsize     "96 MB">
-  <!ENTITY evince-time          "1.2 SBU">
+  <!ENTITY evince-buildsize     "92 MB">
+  <!ENTITY evince-time          "1.1 SBU">
 ]>
 
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/applications/evolution.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-20;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-20;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "a23101c768da96477d24763b01925836">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-22;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-22;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "16e508bb90ab7ca9861e26195a866b73">
   <!ENTITY evolution-size          "12 MB">
-  <!ENTITY evolution-buildsize     "593 MB">
-  <!ENTITY evolution-time          "17 SBU">
+  <!ENTITY evolution-buildsize     "570 MB">
+  <!ENTITY evolution-time          "14 SBU">
 ]>
 
@@ -78,9 +78,10 @@
       <xref linkend="adwaita-icon-theme"/>,
       <xref linkend="evolution-data-server"/>,
+      <xref linkend="gnome-autoar"/>,
       <xref linkend="gtkhtml"/>,
       <xref linkend="itstool"/>,
       <xref linkend="libgdata"/>,
       <xref linkend="shared-mime-info"/>, and
-      <xref linkend="webkitgtk2"/>
+      <xref linkend="webkitgtk"/>
     </para>
 
@@ -107,9 +108,9 @@
       <ulink url="https://wiki.gnome.org/Projects/GTK%2B/GtkImageView/">GtkImageView</ulink>,
       <ulink url="http://gtkspell.sourceforge.net/">GtkSpell3</ulink>,
-      <ulink url="https://github.com/GNOME/gnome-autoar/">gnome-autoar</ulink>,
+<!--      <ulink url="https://github.com/GNOME/gnome-autoar/">gnome-autoar</ulink>, -->
       <ulink url="&gnome-download-http;/libcryptui/">libcryptui</ulink>,
       <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
-      <ulink url="https://github.com/Yeraze/ytnef">libytnef</ulink>, and
-      <ulink url="https://spamassassin.apache.org/">SpamAssassin</ulink>
+      <ulink url="https://github.com/Yeraze/ytnef">libytnef</ulink>,
+<!--       <ulink url="https://spamassassin.apache.org/">SpamAssassin</ulink> -->
     </para>
 
@@ -132,7 +133,5 @@
             --disable-gtkspell    \
             --disable-pst-import  \
-            --disable-autoar      \
-            --disable-libcryptui  \
-            --disable-spamassassin &amp;&amp;
+            --disable-libcryptui  &amp;&amp;
 make</userinput></screen>
 
@@ -157,9 +156,11 @@
     </para>
 
-    <para>
-      <parameter>--disable-autoar</parameter>: This switch disables
+<!--
+    <para>
+      <parameter>- -disable-autoar</parameter>: This switch disables
       automatic archiving support. Omit if you have 
       <application>gnome-autoar</application> installed and wish to use it.
     </para>
+-->
 
     <para>
@@ -181,9 +182,11 @@
     </para>
 
-    <para>
-      <parameter>--disable-spamassassin</parameter>: This switch is
+<!--
+    <para>
+      <parameter>- -disable-spamassassin</parameter>: This switch is
       used to disable the spamassassin plugin because
       <application>SpamAssassin</application> is not part of BLFS.
     </para>
+-->
 
     <para>
Index: gnome/applications/gnome-tweak-tool.xml
===================================================================
--- gnome/applications/gnome-tweak-tool.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/applications/gnome-tweak-tool.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-tweak-tool-download-http
-           "&gnome-download-http;/gnome-tweak-tool/&gnome-minor-20;/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
+           "&gnome-download-http;/gnome-tweak-tool/&gnome-minor-22;/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
   <!ENTITY gnome-tweak-tool-download-ftp
-           "&gnome-download-ftp;/gnome-tweak-tool/&gnome-minor-20;/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
-  <!ENTITY gnome-tweak-tool-md5sum        "2348fdd04a993dddb9a0bc9f42e497a3">
-  <!ENTITY gnome-tweak-tool-size          "252 KB">
-  <!ENTITY gnome-tweak-tool-buildsize     "5.2 MB">
+           "&gnome-download-ftp;/gnome-tweak-tool/&gnome-minor-22;/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
+  <!ENTITY gnome-tweak-tool-md5sum        "3f26867f0ac19109ad7563f9814dcd7c">
+  <!ENTITY gnome-tweak-tool-size          "256 KB">
+  <!ENTITY gnome-tweak-tool-buildsize     "5.3 MB">
   <!ENTITY gnome-tweak-tool-time          "less than 0.1 SBU">
 ]>
Index: gnome/platform/gnome-user-docs.xml
===================================================================
--- gnome/platform/gnome-user-docs.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/platform/gnome-user-docs.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-user-docs-download-http
-           "&gnome-download-http;/gnome-user-docs/&gnome-minor-20;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+           "&gnome-download-http;/gnome-user-docs/&gnome-minor-22;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
   <!ENTITY gnome-user-docs-download-ftp
-           "&gnome-download-ftp;/gnome-user-docs/&gnome-minor-20;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-md5sum        "c24aba5468acb7d9913d67936c6e6c2e">
+           "&gnome-download-ftp;/gnome-user-docs/&gnome-minor-22;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+  <!ENTITY gnome-user-docs-md5sum        "bf31b3c8366e1de9e6b487a9ab13ec13">
   <!ENTITY gnome-user-docs-size          "13 MB">
-  <!ENTITY gnome-user-docs-buildsize     "173 MB">
-  <!ENTITY gnome-user-docs-time          "2.1 SBU">
+  <!ENTITY gnome-user-docs-buildsize     "178 MB">
+  <!ENTITY gnome-user-docs-time          "2.0 SBU">
 ]>
 
Index: gnome/platform/yelp.xml
===================================================================
--- gnome/platform/yelp.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ gnome/platform/yelp.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-minor-20;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-minor-20;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-md5sum        "9ab298e19ed3f295b27519989faec6f0">
+  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-minor-22;/yelp-&yelp-version;.tar.xz">
+  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-minor-22;/yelp-&yelp-version;.tar.xz">
+  <!ENTITY yelp-md5sum        "2195842c812b4bf3d9903e4e41cb5dd1">
   <!ENTITY yelp-size          "1.3 MB">
-  <!ENTITY yelp-buildsize     "17 MB">
-  <!ENTITY yelp-time          "0.1 SBU">
+  <!ENTITY yelp-buildsize     "22 MB">
+  <!ENTITY yelp-time          "0.2 SBU">
 ]>
 
@@ -31,5 +31,5 @@
 
     <para>
-      The <application>Yelp</application> package contains the help
+      The <application>Yelp</application> package contains a help
       browser used for viewing help files.
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ introduction/welcome/changelog.xml	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -47,4 +47,36 @@
       <para>September 26th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to yelp-3.22.0. Fixes
+          <ulink url="&blfs-ticket-root;8316">#8316</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to highlight-3.32. Fixes
+          <ulink url="&blfs-ticket-root;8356">#8356</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to gnome-user-docs-3.22.0. Partially fixes
+          <ulink url="&blfs-ticket-root;8316">#8316</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to gnome-tweak-tool-3.22.0. Partially fixes
+          <ulink url="&blfs-ticket-root;8315">#8315</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evince-3.22.0. Partially fixes
+          <ulink url="&blfs-ticket-root;8315">#8315</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to epiphany-3.22.0. Partially fixes
+          <ulink url="&blfs-ticket-root;8315">#8315</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to baobab-3.22.0. Partially fixes
+          <ulink url="&blfs-ticket-root;8315">#8315</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to Evolution-3.22.0. Partially fixes
+          <ulink url="&blfs-ticket-root;8315">#8315</ulink>.</para>
+        </listitem>
         <listitem revision="systemd">
           <para>[renodr] - Update to Vinagre-3.22.0. Partially fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 0129a2f5f09834be9dab6f9d91a057be4f9ee679)
+++ packages.ent	(revision ac61d9b592507506710d7576a63967f7c5e324a9)
@@ -213,5 +213,5 @@
 <!ENTITY hicolor-icon-theme-version   "0.15">
 <!ENTITY icon-naming-utils-version    "0.8.90">
-<!ENTITY highlight-version            "3.31">
+<!ENTITY highlight-version            "3.32">
 <!ENTITY ibus-version                 "1.5.14">
 <!ENTITY imagemagick-version          "6.9.5">
