diff --git a/general.ent b/general.ent
index 8f09af1204..c0d04eb902 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "20">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 19th, &year;">
+<!ENTITY releasedate  "March 20th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/genlib/xapian.xml b/general/genlib/xapian.xml
index d4e4c385e2..d0163f1d50 100644
--- a/general/genlib/xapian.xml
+++ b/general/genlib/xapian.xml
@@ -7,10 +7,10 @@
   <!ENTITY xapian-download-http
            "http://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
   <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "54ec8333757eb94dbde76d31d185af91">
-  <!ENTITY xapian-size          "3.1 MB">
-  <!ENTITY xapian-buildsize     "129 MB (Additional 96 MB for tests)">
-  <!ENTITY xapian-time          "1.4 SBU (Additional 16 SBU for tests, using parallelism=4)">
+  <!ENTITY xapian-md5sum        "eecb650d8b73e09a63f32140f2d810ce">
+  <!ENTITY xapian-size          "3.0 MB">
+  <!ENTITY xapian-buildsize     "138 MB (Additional 188 MB for tests)">
+  <!ENTITY xapian-time          "1.2 SBU (Additional 15 SBU for tests)">
 ]>
 
 <sect1 id="xapian" xreflabel="xapian-&xapian-version;">
@@ -58,6 +58,13 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Xapian Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="valgrind"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/xapian"/></para>
 
@@ -74,6 +81,9 @@
             --docdir=/usr/share/doc/xapian-core-&xapian-version; &amp;&amp;
 make</userinput></screen>
 
+    
+
+
     <para>
       To run the test suite, issue: <command>make check</command>.
     </para>
diff --git a/general/prog/apache-ant.xml b/general/prog/apache-ant.xml
index 0ef9c5ed51..df2cbfc04e 100644
--- a/general/prog/apache-ant.xml
+++ b/general/prog/apache-ant.xml
@@ -30,8 +30,8 @@
     <title>Introduction to Apache Ant</title>
 
     <para>The <application>Apache Ant</application> package is a
-    <application>Java</application>-based build tool. In theory, it is kind of
-    like <command>make</command>, but without <command>make</command>'s
+    <application>Java</application>-based build tool. In theory, it is 
+    like the <command>make</command> command, but without <command>make</command>'s
     wrinkles. <application>Ant</application> is different. Instead of a model
     that is extended with shell-based commands, <application>Ant</application>
     is extended using <application>Java</application> classes. Instead of
diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml
index b3e709c956..6755028293 100644
--- a/general/prog/tcl.xml
+++ b/general/prog/tcl.xml
@@ -138,7 +138,7 @@ sed -e "s#$SRCDIR/unix#/usr/lib#" \
     -e "s#$SRCDIR#/usr/include#"  \
     -i tclConfig.sh               &amp;&amp;
 
-sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc1.0.2#" \
+sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc&tdbc-ver;#" \
     -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/generic#/usr/include#"    \
     -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/library#/usr/lib/tcl8.6#" \
     -e "s#$SRCDIR/pkgs/&tdbc-ver;#/usr/include#"            \
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4f10227e99..3c2236cb86 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,20 @@
 
 -->
 
+    <listitem>
+      <para>March 20th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gptfdisk-1.0.0. Fixes
+          <ulink url="&blfs-ticket-root;6272">#6272</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xapian-1.2.20. Fixes
+          <ulink url="&blfs-ticket-root;6191">#6191</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 19th, 2015</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index e282560f51..d6e2b37a2c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -44,7 +44,7 @@
 <!ENTITY lvm2-version                 "2.02.117">
 <!ENTITY mdadm-version                "3.3.2">
 <!ENTITY ntfs-3g-version              "2014.2.15">
-<!ENTITY gptfdisk-version             "0.8.10">
+<!ENTITY gptfdisk-version             "1.0.0">
 <!ENTITY parted-version               "3.2">
 <!ENTITY reiser-version               "3.6.24">
 <!ENTITY sshfs-fuse-version           "2.5">
@@ -145,7 +145,7 @@
 <!ENTITY sbc-version                  "1.3">
 <!ENTITY talloc-version               "2.1.1">
 <!ENTITY wv-version                   "1.2.9">
-<!ENTITY xapian-version               "1.2.19">
+<!ENTITY xapian-version               "1.2.20">
 
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
diff --git a/postlfs/filesystems/gptfdisk.xml b/postlfs/filesystems/gptfdisk.xml
index 0fbeb78a0c..a1a3fd4345 100644
--- a/postlfs/filesystems/gptfdisk.xml
+++ b/postlfs/filesystems/gptfdisk.xml
@@ -7,9 +7,9 @@
   <!ENTITY gptfdisk-download-http
     "&sourceforge-repo;/project/gptfdisk/gptfdisk/&gptfdisk-version;/gptfdisk-&gptfdisk-version;.tar.gz">
   <!ENTITY gptfdisk-download-ftp  " ">
-  <!ENTITY gptfdisk-md5sum        "9cf4246c181c324bdbd553fe9b348373">
+  <!ENTITY gptfdisk-md5sum        "2061f917af084215898d4fea04d8388f">
   <!ENTITY gptfdisk-size          "192 KB">
-  <!ENTITY gptfdisk-buildsize     "2.9 MB">
+  <!ENTITY gptfdisk-buildsize     "2.1 MB">
   <!ENTITY gptfdisk-time          "less than 0.1 SBU">
 ]>