Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision 937adc01a1da3218f211952c6ed1c30d53f2285a)
+++ general/genlib/xapian.xml	(revision d3736296004843100429f184f2e37303ffa9d21f)
@@ -8,8 +8,8 @@
            "http://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
   <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "0036ae0e1e1065ba1734790de69835b3">
+  <!ENTITY xapian-md5sum        "cd7615e14a87a033cee2993a016edc43">
   <!ENTITY xapian-size          "2.7 MB">
-  <!ENTITY xapian-buildsize     "118 MB (additional 112 MB for tests)">
-  <!ENTITY xapian-time          "1.7 SBU (additional 16 SBU for tests)">
+  <!ENTITY xapian-buildsize     "120 MB (add 113 MB for tests)">
+  <!ENTITY xapian-time          "1.7 SBU (add 26 SBU for tests)">
 ]>
 
@@ -63,5 +63,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="valgrind"/>
+      <xref linkend="valgrind"/> (for tests)
     </para>
 
@@ -83,5 +83,6 @@
 
     <para>
-      To run the test suite, issue: <command>make check</command>.
+      To run the test suite, issue: <command>make check</command>. 
+      Several tests based on valgrind fail.
     </para>
 
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 937adc01a1da3218f211952c6ed1c30d53f2285a)
+++ general/prog/python3.xml	(revision d3736296004843100429f184f2e37303ffa9d21f)
@@ -8,8 +8,8 @@
            "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "8906efbacfcdc7c3c9198aeefafd159e">
-  <!ENTITY python3-size          "15 MB">
-  <!ENTITY python3-buildsize     "360 MB (with docs; additional 23 MB for the tests)">
-  <!ENTITY python3-time          "1.1 SBU (additional 1.9 SBU for the tests)">
+  <!ENTITY python3-md5sum        "82b143ebbf4514d7e05876bed7a6b1f5">
+  <!ENTITY python3-size          "16 MB">
+  <!ENTITY python3-buildsize     "355 MB (with docs; add 30 MB for the tests)">
+  <!ENTITY python3-time          "1.3 SBU (add 1.0 SBU for the tests)">
 
   <!ENTITY python3htmldoc-download-http
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 937adc01a1da3218f211952c6ed1c30d53f2285a)
+++ introduction/welcome/changelog.xml	(revision d3736296004843100429f184f2e37303ffa9d21f)
@@ -48,4 +48,12 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to xapian-core-1.4.2. Fixes
+          <ulink url="&blfs-ticket-root;8685">#8685</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.6.0. Fixes
+          <ulink url="&blfs-ticket-root;8680">#8680</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to opencv-3.2.0. Fixes
           <ulink url="&blfs-ticket-root;8679">#8679</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 937adc01a1da3218f211952c6ed1c30d53f2285a)
+++ packages.ent	(revision d3736296004843100429f184f2e37303ffa9d21f)
@@ -167,5 +167,5 @@
 <!ENTITY wayland-protocols-version    "1.7">
 <!ENTITY wv-version                   "1.2.9">
-<!ENTITY xapian-version               "1.4.1">
+<!ENTITY xapian-version               "1.4.2">
 <!ENTITY yaml-version                 "0.1.6">
 
@@ -300,5 +300,5 @@
 <!ENTITY php-version                  "7.1.0">
 <!ENTITY python2-version              "2.7.13">
-<!ENTITY python3-version              "3.5.2">
+<!ENTITY python3-version              "3.6.0">
 <!ENTITY ruby-minor-version           "2.3">
 <!ENTITY ruby-patch-version           "3">
@@ -321,5 +321,5 @@
 
 <!ENTITY python2-majorver             "2.7">
-<!ENTITY python3-majorver             "3.5">
+<!ENTITY python3-majorver             "3.6">
 
 <!-- Perl module versions used in the Perl Modules instructions -->
