Index: general.ent
===================================================================
--- general.ent	(revision 20540042be785788a81f5530ca76f3bee8371f58)
+++ general.ent	(revision ba056d797628d6744df231d12d91b12ba9b47f59)
@@ -658,6 +658,6 @@
 <!ENTITY evince-version               "3.6.1">
 <!ENTITY file-roller-version          "3.6.3">
-<!ENTITY gcalctool-version            "6.6.2">
-<!ENTITY gedit-version                "3.6.2">
+<!ENTITY gedit-version                "3.8.3">
+<!ENTITY gnome-calculator-version     "3.8.2">
 <!ENTITY gnome-nettool-version        "3.2.0">
 <!ENTITY gnome-power-manager-version  "3.6.0">
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision 20540042be785788a81f5530ca76f3bee8371f58)
+++ general/genutils/gtk-doc.xml	(revision ba056d797628d6744df231d12d91b12ba9b47f59)
@@ -66,7 +66,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="DocBook"/>,
-    <xref linkend="docbook-xsl"/>, and
-    <xref linkend="libxslt"/></para>
+    <para role="required">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>,
+      <xref linkend="itstool"/> and
+      <xref linkend="libxslt"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 20540042be785788a81f5530ca76f3bee8371f58)
+++ gnome/applications/applications.xml	(revision ba056d797628d6744df231d12d91b12ba9b47f59)
@@ -27,6 +27,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-calculator.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-nettool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-power-manager.xml"/>
Index: ome/applications/gcalctool.xml
===================================================================
--- gnome/applications/gcalctool.xml	(revision 20540042be785788a81f5530ca76f3bee8371f58)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/6.6/gcalctool-&gcalctool-version;.tar.xz">
-  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/6.6/gcalctool-&gcalctool-version;.tar.xz">
-  <!ENTITY gcalctool-md5sum        "94b40737ab5d37983826ee558711199f">
-  <!ENTITY gcalctool-size          "948 KB">
-  <!ENTITY gcalctool-buildsize     "31 MB">
-  <!ENTITY gcalctool-time          "0.2 SBU">
-]>
-
-<sect1 id="gcalctool" xreflabel="Gcalctool-&gcalctool-version;">
-  <?dbhtml filename="gcalctool.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gcalctool-&gcalctool-version;</title>
-
-  <indexterm zone="gcalctool">
-    <primary sortas="a-Gcalctool">Gcalctool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gcalctool</title>
-
-    <para>
-      <application>Gcalctool</application> is a powerful graphical
-      calculator with financial, logical and scientific modes. It uses a
-      multiple precision package to do its arithmetic to give a high degree
-      of accuracy.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcalctool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcalctool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcalctool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcalctool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcalctool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcalctool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gcalctool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gcalctool"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gcalctool</title>
-
-    <para>
-      Install <application>Gcalctool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcalccmd and gcalctool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gcalctool and
-          /usr/share/help/*/gcalctool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcalctool-prog">
-        <term><command>gcalctool</command></term>
-        <listitem>
-          <para>
-            is the official calculator of the
-            <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="gcalctool gcalctool-prog">
-            <primary sortas="b-gcalctool">gcalctool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcalccmd">
-        <term><command>gcalccmd</command></term>
-        <listitem>
-          <para>
-            is a command line version of
-            <application>gcalctool</application>.
-          </para>
-          <indexterm zone="gcalctool gcalccmd">
-            <primary sortas="b-gcalccmd">gcalccmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision 20540042be785788a81f5530ca76f3bee8371f58)
+++ gnome/applications/gedit.xml	(revision ba056d797628d6744df231d12d91b12ba9b47f59)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/3.6/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/3.6/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "7c336819c023a4772cfb48ebe95a7113">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/3.8/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/3.8/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "dd81bffac9026854e33ded9e8ed9bf7c">
   <!ENTITY gedit-size          "3.0 MB">
-  <!ENTITY gedit-buildsize     "105 MB">
-  <!ENTITY gedit-time          "0.8 SBU">
+  <!ENTITY gedit-buildsize     "110 MB">
+  <!ENTITY gedit-time          "0.6 SBU">
 ]>
 
@@ -85,12 +85,14 @@
       <xref linkend="enchant"/> and
       <xref linkend="iso-codes"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libzeitgeist"/> and
+      <xref linkend="gvfs"/>,
+      <xref linkend="libsoup"/> and
       <xref linkend="pygobject3"/>
+      (<application>Python</application> 3 module)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>
+      <xref linkend="gtk-doc"/> and
+      <ulink url="https://launchpad.net/zeitgeist/">Zeitgeist</ulink>
     </para>
 
@@ -158,6 +160,6 @@
           /usr/lib/gedit,
           /usr/share/gedit,
-          /usr/share/gtk-doc/html/gedit
-          and /usr/share/help/*/gedit
+          /usr/share/gtk-doc/html/gedit and
+          /usr/share/help/*/gedit
         </seg>
       </seglistitem>
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision ba056d797628d6744df231d12d91b12ba9b47f59)
+++ gnome/applications/gnome-calculator.xml	(revision ba056d797628d6744df231d12d91b12ba9b47f59)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gnome-calculator-download-http
+           "&gnome-download-http;/gnome-calculator/3.8/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-download-ftp
+           "&gnome-download-ftp;/gnome-calculator/3.8/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "1040c061ee791a44a00e1ea7482feb61">
+  <!ENTITY gnome-calculator-size          "1.1 KB">
+  <!ENTITY gnome-calculator-buildsize     "45 MB">
+  <!ENTITY gnome-calculator-time          "0.2 SBU">
+]>
+
+<sect1 id="gnome-calculator" xreflabel="gnome-calculator-&gnome-calculator-version;">
+  <?dbhtml filename="gnome-calculator.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-calculator-&gnome-calculator-version;</title>
+
+  <indexterm zone="gnome-calculator">
+    <primary sortas="a-gnome-calculator">gnome-calculator</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Calculator</title>
+
+    <para>
+      <application>GNOME Calculator</application> is a powerful graphical
+      calculator with financial, logical and scientific modes. It uses a
+      multiple precision package to do its arithmetic to give a high degree
+      of accuracy.
+    </para>
+
+    &lfs72_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-calculator-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-calculator-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-calculator-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-calculator-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-calculator-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-calculator-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Calculator Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/> and
+      <xref linkend="yelp-xsl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="vala"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gnome-calculator"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Calculator</title>
+
+    <para>
+      Install <application>GNOME Calculator</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gcalccmd and gnome-calculator
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/gnome-calculator and
+          /usr/share/help/*/gnome-calculator
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-calculator-prog">
+        <term><command>gnome-calculator</command></term>
+        <listitem>
+          <para>
+            is the official calculator of the
+            <application>GNOME</application> Desktop.
+          </para>
+          <indexterm zone="gnome-calculator gnome-calculator-prog">
+            <primary sortas="b-gnome-calculator">gnome-calculator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gcalccmd">
+        <term><command>gcalccmd</command></term>
+        <listitem>
+          <para>
+            is a command line version of
+            <application>gnome-calculator</application>.
+          </para>
+          <indexterm zone="gnome-calculator gcalccmd">
+            <primary sortas="b-gcalccmd">gcalccmd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
