Index: archive/webkitgtk.xml
===================================================================
--- archive/webkitgtk.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
+++ archive/webkitgtk.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -0,0 +1,260 @@
+<?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 webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
+  <!ENTITY webkitgtk-download-ftp  " ">
+  <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
+  <!ENTITY webkitgtk-size          "8.3 MB">
+  <!ENTITY webkitgtk-buildsize     "650 MB">
+  <!ENTITY webkitgtk-time          "55 SBU">
+]>
+
+<sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
+  <?dbhtml filename="webkitgtk.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>WebKitGTK+-&webkitgtk-version;</title>
+
+  <indexterm zone="webkitgtk">
+    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to WebKitGTK+</title>
+
+    <para>
+      The <application>WebKitGTK+</application> is the port of the portable
+      web rendering engine <application>WebKit</application> to the
+      <application>GTK+ 2</application> platform.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &webkitgtk-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &webkitgtk-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &webkitgtk-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &webkitgtk-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst-plugins-base"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="mesalib"/>,
+      <xref linkend="ruby"/>,
+      <xref linkend="sqlite"/> and
+      <xref linkend="which"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="enchant"/>,
+      <xref linkend="geoclue"/> and
+      <xref linkend="hicolor-icon-theme"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="curl"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/> and
+      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of WebKitGTK+</title>
+
+    <para>
+      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
+      cause <command>make install</command> to fail:
+    </para>
+
+<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
+
+    <para>
+      Install <application>WebKitGTK+</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>sed -i '/parse-param/ a%lex-param {YYLEX_PARAM}' \
+             Source/ThirdParty/ANGLE/src/compiler/glslang.y &amp;&amp;
+patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
+./configure --prefix=/usr --with-gtk=2.0 --disable-webkit2  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite. However, there is a
+      useable basic graphical web browser in the source directory,
+      <application>Programs/GtkLauncher</application>. If it fails, there is a
+      problem with the build.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install                                    &amp;&amp;
+rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0    &amp;&amp;
+mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</command>:
+      There is a conflict with the directory installed with same name by
+      <xref linkend="webkitgtk2"/>.
+    </para>
+
+    <para>
+      <command>sed ... Source/ThirdParty/ANGLE/src/compiler/glslang.y</command>:
+      This command corrects a problem caused by the most recent version of
+      Bison.
+    </para>
+
+    <para>
+      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
+      force <application>WebKitGTK+</application> to compile against
+      <application>GTK+ 2</application>, even if
+      <application>GTK+ 3</application> is also installed.
+    </para>
+
+    <para>
+      <option>--disable-geolocation</option>: Use this option if you did not
+      install <xref linkend="geoclue"/> or <command>configure</command> will
+      fail.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          jsc-1
+        </seg>
+        <seg>
+          libjavascriptcoregtk-1.0.so and libwebkitgtk-1.0.so
+        </seg>
+        <seg>
+          /usr/include/webkit-1.0,
+          /usr/share/gtk-doc/html/webkitgtk-1.0 and
+          /usr/share/webkit-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="jsc-1">
+        <term><command>jsc-1</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that allows you to run JavaScript programs
+            outside of the context of a web browser.
+          </para>
+          <indexterm zone="webkitgtk jsc-1">
+            <primary sortas="b-jsc-1">jsc-1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-1">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains core JavaScript API functions used by <command>jsc-1</command>
+            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk libjavascriptcoregtk-1">
+            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkitgtk-1">
+        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKitGTK+</application> API functions for
+            <application>GTK+ 2</application>.
+          </para>
+          <indexterm zone="webkitgtk libwebkitgtk-1">
+            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ general/prog/tk.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -7,5 +7,5 @@
   <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  " ">
-  <!ENTITY tk-md5sum        "39782d44cf924827019a2828d54a80e7">
+  <!ENTITY tk-md5sum        "a719038d2df12ffd41dda4a255da5e09">
   <!ENTITY tk-size          "4.1 MB">
   <!ENTITY tk-buildsize     "24 MB">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ introduction/welcome/changelog.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -48,4 +48,21 @@
       <para>August 28th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - LibreOffice-4.3.0 - fix broken symbolic links.
+          Thanks Wayne B.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Fix Tk-8.6.2 md5sum that changed overnight.
+          Thanks Wayne B.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Remove WebKitGTK+1.10.x, consequently, fix
+          Midori-0.5.8 and Gimp-2.8.14 (remove broken ftp link from the latter).
+          Fixes <ulink url="&blfs-ticket-root;5434">#5434</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to webkitgtk-2.4.5. Fixes
+          <ulink url="&blfs-ticket-root;5426">#5426</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Added libpaper-1.1.24+nmu3. Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ packages.ent	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -449,6 +449,5 @@
 <!ENTITY shared-mime-info-version     "1.3">
 <!ENTITY startup-notification-version "0.12">
-<!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
-<!ENTITY webkitgtk2-version           "2.4.4">    <!-- Even minors only -->
+<!ENTITY webkitgtk2-version           "2.4.5">    <!-- Even minors only -->
 <!ENTITY xulrunner-version            "31.0">
 
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ x/lib/lib.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -57,5 +57,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
 
Index: lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ 	(revision )
@@ -1,260 +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 webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
-  <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
-  <!ENTITY webkitgtk-size          "8.3 MB">
-  <!ENTITY webkitgtk-buildsize     "650 MB">
-  <!ENTITY webkitgtk-time          "55 SBU">
-]>
-
-<sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
-  <?dbhtml filename="webkitgtk.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>WebKitGTK+-&webkitgtk-version;</title>
-
-  <indexterm zone="webkitgtk">
-    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK+</title>
-
-    <para>
-      The <application>WebKitGTK+</application> is the port of the portable
-      web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 2</application> platform.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue"/> and
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK+</title>
-
-    <para>
-      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
-      cause <command>make install</command> to fail:
-    </para>
-
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
-
-    <para>
-      Install <application>WebKitGTK+</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i '/parse-param/ a%lex-param {YYLEX_PARAM}' \
-             Source/ThirdParty/ANGLE/src/compiler/glslang.y &amp;&amp;
-patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
-./configure --prefix=/usr --with-gtk=2.0 --disable-webkit2  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there is a
-      useable basic graphical web browser in the source directory,
-      <application>Programs/GtkLauncher</application>. If it fails, there is a
-      problem with the build.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                    &amp;&amp;
-rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0    &amp;&amp;
-mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</command>:
-      There is a conflict with the directory installed with same name by
-      <xref linkend="webkitgtk2"/>.
-    </para>
-
-    <para>
-      <command>sed ... Source/ThirdParty/ANGLE/src/compiler/glslang.y</command>:
-      This command corrects a problem caused by the most recent version of
-      Bison.
-    </para>
-
-    <para>
-      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed.
-    </para>
-
-    <para>
-      <option>--disable-geolocation</option>: Use this option if you did not
-      install <xref linkend="geoclue"/> or <command>configure</command> will
-      fail.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jsc-1
-        </seg>
-        <seg>
-          libjavascriptcoregtk-1.0.so and libwebkitgtk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/webkit-1.0,
-          /usr/share/gtk-doc/html/webkitgtk-1.0 and
-          /usr/share/webkit-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jsc-1">
-        <term><command>jsc-1</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk jsc-1">
-            <primary sortas="b-jsc-1">jsc-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-1">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-1</command>
-            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-1">
-            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk libwebkitgtk-1">
-            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ x/lib/webkitgtk2.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -7,8 +7,8 @@
   <!ENTITY webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
   <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "79edd28d32172abc17a8861622cc274f">
+  <!ENTITY webkitgtk2-md5sum        "c2e1687bb0314a0948fbf78e2d1e931f">
   <!ENTITY webkitgtk2-size          "9.4 MB">
-  <!ENTITY webkitgtk2-buildsize     "938 MB">
-  <!ENTITY webkitgtk2-time          "77 SBU">
+  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
+  <!ENTITY webkitgtk2-time          "138 SBU (both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
 ]>
 
@@ -31,7 +31,8 @@
 
     <para>
-      The <application>WebKitGTK+</application> is the port of the portable
-      web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> platform.
+      The <application>WebKitGTK+</application> is the port of the portable web
+      rendering engine <application>WebKit</application> to the
+      <application>GTK+ 3</application> and/or <application>GTK+
+      2</application> platforms.
     </para>
 
@@ -77,4 +78,5 @@
     <para role="required">
       <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk2"/> or
       <xref linkend="gtk3"/>,
       <xref linkend="icu"/>,
@@ -89,4 +91,10 @@
     </para>
 
+    <note><para>
+      WebKit2 links against GTK+ 2 (even if GTK+ 3 is being used), in order to
+      be able to use NPAPI plugins such as Adobe Flash.
+    </para></note>
+
+
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -94,5 +102,4 @@
       <xref linkend="geoclue"/>,
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/> and
       <xref linkend="hicolor-icon-theme"/>
     </para>
@@ -115,15 +122,4 @@
     <title>Installation of WebKitGTK+</title>
 
-    <warning>
-      <para>
-        If you are building <application>WebKitGTK+</application>
-        with <command>make</command> 3.82, make sure that you have built
-        it with the following
-        <ulink url="&patch-downloads;/make/make-3.82-upstream_fixes-3.patch">
-        patch</ulink> applied or <application>WebKitGTK+</application>
-        build may fail.
-      </para>
-    </warning>
-
     <para>
       If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
@@ -131,5 +127,19 @@
     </para>
 
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
+<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' \
+                           GNUmakefile.in</userinput></screen>
+
+    <para>
+      Upstream standard now is to link this package against GTK+ 3. However,
+      for backward compatibility, manu users need also another instance, linked
+      to GTK+ 2. Both can be installed in the same system, without problem.
+      However, some packages can alternatively be linked to either one. Here,
+      both build methods are presented and recommended to be built, but if you
+      know which one you need, just jump to the respective part. 
+    </para>
+
+<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
+    <bridgehead renderas="sect3">Build and install WebKitGTK+ against
+      GTK+ 3</bridgehead>
 
     <para>
@@ -138,11 +148,15 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr          \
-            --enable-introspection &amp;&amp;
+<screen><userinput>mkdir -vp build-3           &amp;&amp;
+cp -a Documentation build-3 &amp;&amp;
+cd build-3                  &amp;&amp;
+
+
+../configure --prefix=/usr --enable-introspection &amp;&amp;
 make</userinput></screen>
 
     <para>
       This package does not have a working testsuite. However, there are two
-      useable basic graphical web browsers in the source directory,
+      useable basic graphical web browsers in the build directory,
       <application>Programs/GtkLauncher</application> and
       <application>Programs/MiniBrowser</application>. If launching any one
@@ -162,17 +176,72 @@
     </para>
 
-<screen role="root"><userinput>make install                                    &amp;&amp;
-rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &amp;&amp;
-mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Finally, leave the buid directory:
+    </para>
+
+<screen><userinput>cd ..</userinput></screen>
+
+<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
+    <bridgehead renderas="sect3">Build and install WebKitGTK+ against
+      GTK+ 2</bridgehead>
+
+    <para>
+      Install <application>WebKitGTK+</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>mkdir -vp build-1</userinput></screen>
+
+    <para>
+      If you have built and installed the package against GTK+ 3, skip the
+      following command, because the previous docummentation also applies here:
+    </para>
+
+<screen><userinput>cp -a Documentation build-1</userinput></screen>
+
+    <para>
+      Now, change into the build directory and effectively start the build and
+      install:
+    </para>
+
+<screen><userinput>cd build-1 &amp;&amp;
+
+
+../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite. However, there is one
+      useable basic graphical web browser in the build directory,
+      <application>Programs/GtkLauncher</application>. If launching it
+      fails, there is a problem with the build.
+    </para>
+
+    <note><para>
+      When installing, the Makefile does some additional compiling and linking.
+      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
+      variables need to be defined for the root user.  If using sudo to assume
+      root, use the -E option to pass your current environment variables for the
+      install process.
+    </para></note>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Finally, leave the buid directory:
+    </para>
+
+<screen><userinput>cd ..</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</command>:
-      There is a conflict with the directory installed with same name by
-      <xref linkend="webkitgtk"/>.
-    </para>
 
     <para>
@@ -193,10 +262,4 @@
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--libexecdir=/usr/lib/webkitgtk3</option>: This option
-    puts the package's private programs into
-    <filename class="directory">/usr/lib/webkitgtk3</filename> instead of
-    <filename class="directory">/usr/libexec</filename> in accordance with
-    the old version of the FHS used before LFS-7.5.</para>
-
   </sect2>
 
@@ -205,5 +268,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -211,18 +274,22 @@
       <seglistitem>
         <seg>
-          jsc-3
+          jsc-1, and jsc-3
         </seg>
         <seg>
+          libjavascriptcoregtk-1.0.so,
           libjavascriptcoregtk-3.0.so,
           libwebkit2gtk-3.0.so,
-          libwebkitgtk-3.0.so and
-          /usr/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
+          libwebkitgtk-1.0.so,
+          libwebkitgtk-3.0.so, and
+          webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
         </seg>
         <seg>
+          /usr/include/webkitgtk-1.0,
           /usr/include/webkitgtk-3.0,
           /usr/lib/webkit2gtk-3.0,
-          /usr/share/gtk-doc/html/webkitgtk-2.0,
+          /usr/share/gtk-doc/html/webkit2gtk,
           /usr/share/gtk-doc/html/webkitdomgtk,
-          /usr/share/gtk-doc/html/webkit2gtk, and
+          /usr/share/gtk-doc/html/webkitgtk,
+          /usr/share/webkitgtk-1.0, and
           /usr/share/webkitgtk-3.0
         </seg>
@@ -235,4 +302,17 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="jsc-1">
+        <term><command>jsc-1</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that allows you to run JavaScript programs
+            outside of the context of a web browser.
+          </para>
+          <indexterm zone="webkitgtk2 jsc-1">
+            <primary sortas="b-jsc-1">jsc-1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="jsc-3">
         <term><command>jsc-3</command></term>
@@ -244,4 +324,18 @@
           <indexterm zone="webkitgtk2 jsc-3">
             <primary sortas="b-jsc-3">jsc-3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-1">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains core JavaScript API functions used by <command>jsc-1</command>
+            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1">
+            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
           </indexterm>
         </listitem>
@@ -256,23 +350,22 @@
             and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
           </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-3">
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3">
             <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="libwebkit2gtkinjectedbundle">
-        <term><filename class="libraryfile">libwebkit2gtkinjectedbundle.so</filename></term>
+
+      <varlistentry id="libwebkitgtk-1">
+        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
         <listitem>
           <para>
             contains the <application>WebKitGTK+</application> API functions for
-            the Injected Bundle support.
-          </para>
-          <indexterm zone="webkitgtk libwebkit2gtkinjectedbundle">
-            <primary sortas="c-libwebkit2gtkinjectedbundle">libwebkit2gtkinjectedbundle.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+            <application>GTK+ 2</application>.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkitgtk-1">
+            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="libwebkitgtk-3">
@@ -283,5 +376,5 @@
             <application>GTK+ 3</application>.
           </para>
-          <indexterm zone="webkitgtk libwebkitgtk-3">
+          <indexterm zone="webkitgtk2 libwebkitgtk-3">
             <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
           </indexterm>
@@ -295,5 +388,5 @@
             contains the <application>WebKit2</application> API functions.
           </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-3">
+          <indexterm zone="webkitgtk2 libwebkit2gtk-3">
             <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
           </indexterm>
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ xfce/apps/midori.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -79,5 +79,4 @@
       <xref linkend="cmake"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk"/> or
       <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
       <xref linkend="vala"/>
@@ -138,7 +137,10 @@
 
     <para>
-      <option>--enable-gtk3</option>: Use this switch if you want
-      to build <application>Midori</application> with
-      <application>WebKitGTK+ 2</application> dependencies.
+      <option>--enable-gtk3</option>: Use this switch if you want to build
+      <application>Midori</application> with
+      <application>WebKitGTK+</application> built against <application>GTK+
+      3</application>, because by default it chooses
+      <application>WebKitGTK+</application> built against <application>GTK+
+      2</application>.
     </para>
 
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ xsoft/office/libreoffice.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -289,6 +289,9 @@
 tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
 -->
-ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
-ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+
+ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
+       external/tarballs/ &amp;&amp;
+ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz \
+       external/tarballs/</userinput></screen>
 
 <!-- Not necessary for this version
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 13b64e36b43f633e1b2dcfe7bf02d16029521f0b)
+++ xsoft/other/gimp.xml	(revision 5e11bc38e7cbc0f25936f0a0d9e35ee4eb7bf288)
@@ -6,5 +6,6 @@
 
   <!ENTITY gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
+  <!ENTITY gimp-download-ftp  " ">
+<!--  <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">-->
   <!ENTITY gimp-md5sum        "233c948203383fa078434cc3f8f925cb">
   <!ENTITY gimp-size          "20 MB">
@@ -150,5 +151,5 @@
       <command>sendmail</command> program),
       <xref linkend="udev-extras"/> (for GUdev),
-      <xref linkend="webkitgtk"/> (required for the help-plugin) and
+      <xref linkend="webkitgtk2"/> (required for the help-plugin) and
       <xref linkend="gtk-doc"/>
     </para>
