diff --git a/general.ent b/general.ent
index 3072b1d043..07aa2fc007 100644
--- a/general.ent
+++ b/general.ent
@@ -1,8 +1,8 @@
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "June &day;rd, &year;">
+<!ENTITY releasedate  "June &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|stable|testing|unstable|development] -->
@@ -465,7 +465,7 @@
 <!ENTITY nautilus-cd-burner-version   "2.14.2">
 <!ENTITY gnome-media-version          "2.14.2">
 <!ENTITY gnome-netstatus-version      "2.12.0">
-<!ENTITY gcalctool-version            "5.8.13">
+<!ENTITY gcalctool-version            "5.8.16">
 <!ENTITY gucharmap-version            "1.6.0">
 <!ENTITY zenity-version               "2.14.2">
 <!ENTITY epiphany-version             "2.14.2.1">
diff --git a/gnome/add/gcalctool.xml b/gnome/add/gcalctool.xml
index e3108f02cd..2037f9a136 100644
--- a/gnome/add/gcalctool.xml
+++ b/gnome/add/gcalctool.xml
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/5.6/gcalctool-&gcalctool-version;.tar.bz2">
-  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/5.6/gcalctool-&gcalctool-version;.tar.bz2">
-  <!ENTITY gcalctool-md5sum        "902bccc59d1e888217d5e7d813820ff2">
-  <!ENTITY gcalctool-size          "1.1 MB">
-  <!ENTITY gcalctool-buildsize     "16.8 MB">
+  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/5.8/gcalctool-&gcalctool-version;.tar.bz2">
+  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/5.8/gcalctool-&gcalctool-version;.tar.bz2">
+  <!ENTITY gcalctool-md5sum        "3c14ad97edd4e445b14ca99bb7c60e5b">
+  <!ENTITY gcalctool-size          "1.0 MB">
+  <!ENTITY gcalctool-buildsize     "18.0 MB">
   <!ENTITY gcalctool-time          "0.2 SBU">
 ]>
 
@@ -18,10 +18,6 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gcalctool-&gcalctool-version;.tar</keyword>
-      <keyword role="ftpdir">gcalctool</keyword>
-    </keywordset>
   </sect1info>
 
   <title>gcalctool-&gcalctool-version;</title>
@@ -64,7 +60,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeui"/> and
-    <xref linkend="scrollkeeper"/></para>
+    <xref linkend="gnome-doc-utils"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gcalctool"/></para>
@@ -77,7 +76,7 @@
     <para>Install <application>gcalctool</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
@@ -115,8 +114,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>gcalctool and gnome-calculator</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gcalctool
-        and $GNOME_PREFIX/share/{gnome/help/, omf/}gcalctool</seg>
+        <seg>$GNOME_PREFIX/share/{gnome/help/, omf/}gcalctool</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 1e71f7eb91..aa8b53a54e 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
 
 -->
 
+    <listitem>
+      <para>June 24th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to gcalctool-5.8.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 23rd, 2006</para>
       <itemizedlist>