Index: general.ent
===================================================================
--- general.ent	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ general.ent	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 21st, &year;">
+<!ENTITY releasedate  "April 24th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -266,4 +266,5 @@
 <!ENTITY ptlib-version                "2.10.10">
 <!ENTITY qca-version                  "2.0.3">
+<!ENTITY qjson-version                "0.8.1">
 <!ENTITY sbc-version                  "1.0">
 <!ENTITY slib-version                 "3b3">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ general/genlib/genlib.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -96,4 +96,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slib.xml"/>
Index: general/genlib/libdbusmenuqt.xml
===================================================================
--- general/genlib/libdbusmenuqt.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ general/genlib/libdbusmenuqt.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://qjson.sourceforge.net/">QJson</ulink> (for building the test suite) and
+    <xref linkend="qjson"/> (for building the test suite) and
     <xref linkend="doxygen"/> (for building the API documentation)
     </para>
Index: general/genlib/qjson.xml
===================================================================
--- general/genlib/qjson.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
+++ general/genlib/qjson.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -0,0 +1,146 @@
+<?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 qjson-download-http "http://downloads.sourceforge.net/qjson/qjson-&qjson-version;.tar.bz2">
+  <!ENTITY qjson-download-ftp  " ">
+  <!ENTITY qjson-md5sum        "323fbac54a5a20c0b8fe45c1ced03e2d">
+  <!ENTITY qjson-size          "64 KB">
+  <!ENTITY qjson-buildsize     "1.4 MB">
+  <!ENTITY qjson-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="qjson" xreflabel="QJson-&qjson-version;">
+  <?dbhtml filename="qjson.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>QJson-&qjson-version;</title>
+
+  <indexterm zone="qjson">
+    <primary sortas="a-QJson">QJson</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to QJson</title>
+
+    <para>
+      <application>QJson</application> is a Qt-based library that maps JSON
+      data to QVariant objects and vice versa.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qjson-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qjson-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qjson-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qjson-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qjson-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qjson-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qjson"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of QJson</title>
+
+    <para>
+      Install <application>QJson</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      .. &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not contain 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 Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          none
+        </seg>
+        <seg>
+          libqjson.so
+        </seg>
+        <seg>
+          &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libqjson">
+        <term><filename class="libraryfile">libqjson.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>QJson</application> API functions.
+          </para>
+          <indexterm zone="qjson libqjson">
+            <primary sortas="c-libqjson">libqjson.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ introduction/welcome/changelog.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -46,4 +46,13 @@
 
     <listitem>
+      <para>April 24th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Added QJson 0.8.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 21st, 2013</para>
       <itemizedlist>
Index: kde/add/ark.xml
===================================================================
--- kde/add/ark.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ kde/add/ark.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://qjson.sourceforge.net/">QJson</ulink>
+      <xref linkend="qjson"/>
     </para>
 
Index: kde/add/kate.xml
===================================================================
--- kde/add/kate.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ kde/add/kate.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -81,5 +81,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://qjson.sourceforge.net/">QJson</ulink> and
+      <xref linkend="qjson"/> and
       <ulink url="&kde-download-http;&kde-version;/src/">PyKDE4</ulink>
     </para>
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ kde/add/kdeplasma-addons.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -78,7 +78,7 @@
     <xref linkend="libkexiv2"/>,
     <xref linkend="ibus"/>,
+    <xref linkend="qjson"/>,
     <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),
-    <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin),
-    <ulink url="http://qjson.sourceforge.net/">QJson</ulink> and
+    <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin) and
     <ulink url="https://github.com/ayoy/qoauth">QOAuth</ulink> (needed for the Plasma microblog dataengine)
     </para>
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ kde/core/kde-workspace.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -96,4 +96,5 @@
       <xref linkend="NetworkManager"/>,
       <xref linkend="lm_sensors"/>,
+      <xref linkend="qjson"/>,
       <ulink url="&kde-download-http;&kde-version;/src/">PyKDE4</ulink>,
       <ulink url="http://code.google.com/p/google-gadgets-for-linux/">GoogleGadgets</ulink>,
@@ -101,8 +102,7 @@
       <ulink url="https://ieee1394.wiki.kernel.org/index.html">libraw1394</ulink>,
       <ulink url="http://www.catb.org/gpsd/">gpsd</ulink>,
-      <ulink url="http://www.xmms.org/">XMMS</ulink>,
+      <ulink url="http://www.xmms.org/">XMMS</ulink> and
       <ulink url="http://qalculate.sourceforge.net/">libqalculate</ulink>
-      (wants <ulink url="http://www.ginac.de/CLN/">CLN</ulink>), and
-      <ulink url="http://qjson.sourceforge.net/">QJson</ulink>
+      (wants <ulink url="http://www.ginac.de/CLN/">CLN</ulink>)
     </para>
 
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ kde/core/kdepimlibs.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -76,12 +76,12 @@
     <xref linkend="libical"/>,
     <xref linkend="akonadi"/>,
-    <xref linkend="cyrus-sasl"/> and
-    <xref linkend="boost"/>
+    <xref linkend="cyrus-sasl"/>,
+    <xref linkend="boost"/> and
+    <xref linkend="qjson"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="openldap"/> and
-    <ulink url="http://qjson.sourceforge.net/">QJson</ulink>
+    <xref linkend="openldap"/>
     </para>
 
Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision f6f4c934fb1a12d2ae5d5117911a3ce13ca835bb)
+++ multimedia/audioutils/amarok.xml	(revision f837bd2b26c1fb263d789fe276677a22b4b30bf8)
@@ -93,4 +93,5 @@
       <xref linkend="libxml2"/> (for MP3tunes integration),
       <xref linkend="openssl"/> (for MP3tunes integration),
+      <xref linkend="qjson"/>,
       <ulink url="http://code.google.com/p/clamz/">Clamz</ulink> (For Amazon integration),
       <ulink url="http://www.gtkpod.org/libgpod.html">libgpod</ulink> (for iPod support),
@@ -99,6 +100,5 @@
       <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt">libmygpo-qt</ulink> (for gpodder.net podcast support),
       <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
-      <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink> (for MP3tunes integration),
-      <ulink url="http://qjson.sourceforge.net/">QJson</ulink> (for Playdar integration) and
+      <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink> (for MP3tunes integration) and
       <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>
     </para>
