Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision e5c8de017754309de14beaf8665b1f3a80fbb791)
+++ general/genutils/genutils.xml	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
@@ -31,4 +31,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkhtml.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
 
Index: general/genutils/gtkhtml.xml
===================================================================
--- general/genutils/gtkhtml.xml	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
+++ general/genutils/gtkhtml.xml	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
@@ -0,0 +1,182 @@
+<?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 gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.10/gtkhtml-&gtkhtml-version;.tar.xz">
+  <!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.10/gtkhtml-&gtkhtml-version;.tar.xz">
+  <!ENTITY gtkhtml-md5sum        "a8538daed73de3fb5c7747d05139ef79">
+  <!ENTITY gtkhtml-size          "1.0 MB">
+  <!ENTITY gtkhtml-buildsize     "46 MB">
+  <!ENTITY gtkhtml-time          "0.5 SBU">
+]>
+
+<sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;" revision="systemd">
+  <?dbhtml filename="gtkhtml.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GtkHTML-&gtkhtml-version;</title>
+
+  <indexterm zone="gtkhtml">
+    <primary sortas="a-GtkHTML">GtkHTML</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GtkHTML</title>
+
+    <para>
+      The <application>GtkHTML</application> package contains a
+      lightweight HTML rendering/printing/editing engine.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtkhtml-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtkhtml-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtkhtml-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtkhtml-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtkhtml-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtkhtml-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GtkHTML Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="enchant"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gtk3"/>, and
+      <xref linkend="iso-codes"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://glade.gnome.org/">Glade</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gtkhtml"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GtkHTML</title>
+
+    <para>
+      Fix a build issue with <xref linkend="enchant"/>:
+    </para>
+
+<screen><userinput>sed 's@pwl@session@' -i components/editor/gtkhtml-spell-checker.c</userinput></screen>
+
+    <para>
+      Install <application>GtkHTML</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>
+          gtkhtml-editor-test
+        </seg>
+        <seg>
+          libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so
+        </seg>
+        <seg>
+          /usr/include/libgtkhtml-4.0 and
+          /usr/share/gtkhtml-4.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gtkhtml-editor-test">
+        <term><command>gtkhtml-editor-test</command></term>
+        <listitem>
+          <para>
+            is a simple HTML editor widget.
+          </para>
+          <indexterm zone="gtkhtml gtkhtml-editor-test">
+            <primary sortas="b-gtkhtml-editor-test">gtkhtml-editor-test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgtkhtml-4">
+        <term><filename class="libraryfile">libgtkhtml-4.0.so</filename></term>
+        <listitem>
+          <para>
+            provides the functions used to render HTML within applications.
+          </para>
+          <indexterm zone="gtkhtml libgtkhtml-4">
+            <primary sortas="c-libgtkhtml-4">libgtkhtml-4.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision e5c8de017754309de14beaf8665b1f3a80fbb791)
+++ gnome.ent	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
@@ -34,5 +34,4 @@
 <!ENTITY libwnck-version                   "3.24.1">
 <!ENTITY grilo-version                     "0.3.4">
-<!ENTITY gtkhtml-version                   "4.10.0">
 <!ENTITY libchamplain-version              "0.12.16">
 <!ENTITY libgdata-version                  "0.17.9">
Index: ome/platform/gtkhtml.xml
===================================================================
--- gnome/platform/gtkhtml.xml	(revision e5c8de017754309de14beaf8665b1f3a80fbb791)
+++ 	(revision )
@@ -1,176 +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 gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.10/gtkhtml-&gtkhtml-version;.tar.xz">
-  <!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.10/gtkhtml-&gtkhtml-version;.tar.xz">
-  <!ENTITY gtkhtml-md5sum        "a8538daed73de3fb5c7747d05139ef79">
-  <!ENTITY gtkhtml-size          "1.0 MB">
-  <!ENTITY gtkhtml-buildsize     "46 MB">
-  <!ENTITY gtkhtml-time          "0.5 SBU">
-]>
-
-<sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;" revision="systemd">
-  <?dbhtml filename="gtkhtml.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GtkHTML-&gtkhtml-version;</title>
-
-  <indexterm zone="gtkhtml">
-    <primary sortas="a-GtkHTML">GtkHTML</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkHTML</title>
-
-    <para>
-      The <application>GtkHTML</application> package contains a
-      lightweight HTML rendering/printing/editing engine.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkhtml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkhtml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkhtml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkhtml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkhtml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkhtml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkHTML Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="enchant"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="iso-codes"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://glade.gnome.org/">Glade</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtkhtml"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkHTML</title>
-
-    <para>
-      Install <application>GtkHTML</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>
-          gtkhtml-editor-test
-        </seg>
-        <seg>
-          libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so
-        </seg>
-        <seg>
-          /usr/include/libgtkhtml-4.0 and
-          /usr/share/gtkhtml-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtkhtml-editor-test">
-        <term><command>gtkhtml-editor-test</command></term>
-        <listitem>
-          <para>
-            is a simple HTML editor widget.
-          </para>
-          <indexterm zone="gtkhtml gtkhtml-editor-test">
-            <primary sortas="b-gtkhtml-editor-test">gtkhtml-editor-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkhtml-4">
-        <term><filename class="libraryfile">libgtkhtml-4.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to render HTML within applications.
-          </para>
-          <indexterm zone="gtkhtml libgtkhtml-4">
-            <primary sortas="c-libgtkhtml-4">libgtkhtml-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision e5c8de017754309de14beaf8665b1f3a80fbb791)
+++ gnome/platform/platform.xml	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
@@ -57,5 +57,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-video-effects.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkhtml.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libchamplain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgdata.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e5c8de017754309de14beaf8665b1f3a80fbb791)
+++ introduction/welcome/changelog.xml	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[dj] - Move GtkHTML to genutils, and fix build error with
+          newer enchant.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Update to gnome-online-accounts-3.26.1.</para>
         </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision e5c8de017754309de14beaf8665b1f3a80fbb791)
+++ packages.ent	(revision 5ac36d0cb101e53f6b24d86068faa8ba3eeda84e)
@@ -230,4 +230,5 @@
 <!ENTITY graphviz-version             "2.40.1">   <!-- Even minors only -->
 <!ENTITY gtk-doc-version              "1.26">
+<!ENTITY gtkhtml-version              "4.10.0">
 <!ENTITY hd2u-version                 "1.0.4">
 <!ENTITY hicolor-icon-theme-version   "0.17">
