Index: general/genlib/gspell.xml
===================================================================
--- general/genlib/gspell.xml	(revision f977d64275b6273560e65928de865d394101c4a6)
+++ general/genlib/gspell.xml	(revision 10092cdefd1e1a2388b47394c9a08a97372d02d1)
@@ -9,6 +9,6 @@
   <!ENTITY gspell-download-http "https://&gspell-site;/gspell-&gspell-version;.tar.xz">
   <!ENTITY gspell-download-ftp  "ftp://&gspell-site;/gspell-&gspell-version;.tar.xz">
-  <!ENTITY gspell-md5sum        "4f857382bc9d8d4afe1e67e5b5b9dbff">
-  <!ENTITY gspell-size          "416 KB">
+  <!ENTITY gspell-md5sum        "d0892000d944e87fd74e8611ef400cdb">
+  <!ENTITY gspell-size          "412 KB">
   <!ENTITY gspell-buildsize     "12 MB (with tests)">
   <!ENTITY gspell-time          "0.2 SBU (with tests)">
Index: general/prog/python-dbusmock.xml
===================================================================
--- general/prog/python-dbusmock.xml	(revision 10092cdefd1e1a2388b47394c9a08a97372d02d1)
+++ general/prog/python-dbusmock.xml	(revision 10092cdefd1e1a2388b47394c9a08a97372d02d1)
@@ -0,0 +1,115 @@
+<?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 dbusmock-download-http "https://github.com/martinpitt/python-dbusmock/releases/download/&dbusmock-version;/python-dbusmock-&dbusmock-version;.tar.gz">
+  <!ENTITY dbusmock-download-ftp  " ">
+  <!ENTITY dbusmock-md5sum        "565aaae672e065c9c17e7fafd1843701">
+  <!ENTITY dbusmock-size          "72 KB">
+  <!ENTITY dbusmock-buildsize     "888 KB">
+  <!ENTITY dbusmock-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin dbusmock -->
+  <sect2 id="python-dbusmock" xreflabel="dbusmock-&dbusmock-version;">
+
+    <title>dbusmock-&dbusmock-version;</title>
+
+    <indexterm zone="python-dbusmock">
+      <primary sortas="a-dbusmock">dbusmock</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to dbusmock</title>
+
+      <para>
+        <application>dbusmock</application> a Python library
+        useful for writing tests for software which talks to D-Bus services.
+      </para>
+
+      &lfs90_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&dbusmock-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&dbusmock-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &dbusmock-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &dbusmock-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &dbusmock-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &dbusmock-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/dbusmock"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of dbusmock</title>
+
+      <para>
+        Build the package with:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        To install the package run the following as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            python_dbusmock-&dbusmock-version;-py&python3-majorver;.egg
+          </seg>
+          <seg>
+            None
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End dbusmock -->
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision f977d64275b6273560e65928de865d394101c4a6)
+++ general/prog/python-modules.xml	(revision 10092cdefd1e1a2388b47394c9a08a97372d02d1)
@@ -62,4 +62,9 @@
       <listitem>
         <para>
+          <xref linkend="python-dbusmock"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pygments"/>
         </para>
@@ -165,4 +170,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dbusmock.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pygments.xml"/>
 
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision f977d64275b6273560e65928de865d394101c4a6)
+++ general/sysutils/upower.xml	(revision 10092cdefd1e1a2388b47394c9a08a97372d02d1)
@@ -92,6 +92,6 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="pygobject3"/>,
-      <ulink url="https://github.com/martinpitt/umockdev">umockdev</ulink>, and
-      <ulink url="https://pypi.python.org/pypi/python-dbusmock">python-dbusmock</ulink>
+      <xref linkend="python-dbusmock"/>, and 
+      <ulink url="https://github.com/martinpitt/umockdev">umockdev</ulink>
       (for part of the testsuite).
     </para>
