Index: general.ent
===================================================================
--- general.ent	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ general.ent	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 18th, &year;">
+<!ENTITY releasedate  "January 19th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -189,5 +189,5 @@
 <!ENTITY openssl-version              "1.0.1c">
 <!ENTITY p11-kit-version              "0.14">
-<!ENTITY polkit-version               "0.109">
+<!ENTITY polkit-version               "0.110">
 <!ENTITY shadow-version               "4.1.5.1">
 <!ENTITY stunnel-version              "4.54">
@@ -389,5 +389,5 @@
 <!ENTITY bazaar-version               "2.5.0">
 <!ENTITY check-version                "0.9.9">
-<!ENTITY cmake-version                "2.8.10">
+<!ENTITY cmake-version                "2.8.10.2">
 <!ENTITY cvs-version                  "1.11.23">
 <!ENTITY dejagnu-version              "1.5">
@@ -469,5 +469,5 @@
 <!ENTITY wget-version                 "1.14">
 <!ENTITY wireless-tools-version       "29">
-<!ENTITY wpa_supplicant-version       "1.1">
+<!ENTITY wpa_supplicant-version       "2.0">
 
 <!-- Chapter 16 -->
@@ -490,5 +490,5 @@
 <!ENTITY libevent-version             "2.0.21">
 <!ENTITY libnice-version              "0.1.3">
-<!ENTITY libnl-version                "3.2.16">
+<!ENTITY libnl-version                "3.2.19">
 <!ENTITY libpcap-version              "1.3.0">
 <!ENTITY libproxy-version             "0.4.7">
@@ -866,5 +866,5 @@
 <!ENTITY soundtouch-version           "1.7.1">
 <!ENTITY speex-version                "1.2rc1">
-<!ENTITY taglib-version               "1.7.2">
+<!ENTITY taglib-version               "1.8">
 <!ENTITY xine-lib-version             "1.2.2">
 <!ENTITY xvid-version                 "1.3.2">
@@ -878,5 +878,5 @@
 <!ENTITY audacious-version            "3.3.2">
 <!ENTITY audacious-plugins-version    "3.3.2">
-<!ENTITY amarok-version               "2.6.0">
+<!ENTITY amarok-version               "2.7.0">
 <!ENTITY gvolwheel-version            "1.0">
 
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ general/prog/cmake.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -7,11 +7,11 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "d4aef1eab859df61d2664721a72732c0">
-  <!ENTITY cmake-size          "5.5 MB">
-  <!ENTITY cmake-buildsize     "311 MB (including tests)">
+  <!ENTITY cmake-md5sum        "097278785da7182ec0aea8769d06860c">
+  <!ENTITY cmake-size          "5.6 MB">
+  <!ENTITY cmake-buildsize     "255 MB (including tests)">
   <!ENTITY cmake-time          "1.9 SBU (additional 3.1 SBU for the test suite)">
 ]>
 
-<sect1 id="cmake" xreflabel="cmake-&cmake-version;">
+<sect1 id="cmake" xreflabel="CMake-&cmake-version;">
   <?dbhtml filename="cmake.html"?>
 
@@ -30,10 +30,12 @@
     <title>Introduction to CMake</title>
 
-    <para>The <application>CMake</application> package contains a modern 
-    toolset used for generating Makefiles. It is a successor of the 
-    auto-generated <command>configure</command> script and aims to be platform-
-    and compiler-independent. A significant user of 
-    <application>CMake</application> is <application>KDE</application> since 
-    version 4.</para>
+    <para>
+      The <application>CMake</application> package contains a modern 
+      toolset used for generating Makefiles. It is a successor of the 
+      auto-generated <command>configure</command> script and aims to
+      be platform- and compiler-independent. A significant user of 
+      <application>CMake</application> is <application>KDE</application>
+      since version 4.
+    </para>
 
     &lfs72_checked;
@@ -42,20 +44,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&cmake-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cmake-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cmake-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cmake-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cmake-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cmake-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&cmake-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cmake-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cmake-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cmake-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cmake-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cmake-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -77,6 +91,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cmake"/></para>
-
+      <ulink url="&blfs-wiki;/cmake"/>
+    </para>
   </sect2>
 
@@ -84,6 +98,8 @@
     <title>Installation of CMake</title>
 
-    <para>Install <application>CMake</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>CMake</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./bootstrap --prefix=/usr       \
@@ -93,7 +109,11 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make test</userinput>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <userinput>make test</userinput>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -104,11 +124,16 @@
     <title>Command Explanations</title>
 
-    <para><option>--system-libs</option>: This option forces the build system
-    to link against <application>Zlib</application>, <application>Bzip2</application>, 
-    <application>cURL</application> and <application>Expat</application> installed 
-    on the system.</para>
+    <para>
+      <option>--system-libs</option>: This switch forces the build system to
+      link against <application>Zlib</application>, <application>Bzip2</application>, 
+      <application>cURL</application> and <application>Expat</application> installed 
+      on the system.
+    </para>
     
-    <para><option>--qt-gui</option>: This option builds a <application>Qt</application>-based 
-    GUI for <application>CMake</application>.</para>
+    <para>
+      <option>--qt-gui</option>: This switch enables building of the
+      <application>Qt</application>-based  GUI for
+      <application>CMake</application>.
+    </para>
 
   </sect2>
@@ -119,12 +144,14 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>ccmake, cmake, cmake-gui, cpack and ctest</seg>
-        <seg>none</seg>
-        <seg>/usr/share/cmake-&cmake-major-version; and
-        /usr/share/doc/cmake-&cmake-version;</seg>
+        <seg>
+          ccmake, cmake, cmake-gui, cpack and ctest
+        </seg>
+        <seg>
+          /usr/share/cmake-&cmake-major-version; and
+          /usr/share/doc/cmake-&cmake-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -139,5 +166,8 @@
         <term><command>ccmake</command></term>
         <listitem>
-          <para>is a curses based interactive frontend to cmake.</para>
+          <para>
+            is a curses based interactive frontend to
+            <command>cmake</command>.
+          </para>
           <indexterm zone="cmake ccmake">
             <primary sortas="b-ccmake">ccmake</primary>
@@ -146,9 +176,11 @@
       </varlistentry>
 
-      <varlistentry id="c_make">
+      <varlistentry id="cmake-prog">
         <term><command>cmake</command></term>
         <listitem>
-          <para>is the makefile generator.</para>
-          <indexterm zone="cmake c_make">
+          <para>
+            is the makefile generator.
+          </para>
+          <indexterm zone="cmake cmake-prog">
             <primary sortas="b-cmake">cmake</primary>
           </indexterm>
@@ -159,5 +191,8 @@
         <term><command>cmake-gui</command></term>
         <listitem>
-          <para>is the Qt-based frontent to CMake.</para>
+          <para>
+            is the <application>Qt</application>-based frontent to 
+            <command>cmake</command>.
+          </para>
           <indexterm zone="cmake cmake-gui">
             <primary sortas="b-cmake-gui">cmake-gui</primary>
@@ -169,5 +204,7 @@
         <term><command>cpack</command></term>
         <listitem>
-          <para>is the CMake packaging program.</para>
+          <para>
+            is the <application>CMake</application> packaging program.
+          </para>
           <indexterm zone="cmake cpack">
             <primary sortas="b-cpack">cpack</primary>
@@ -179,5 +216,7 @@
         <term><command>ctest</command></term>
         <listitem>
-          <para>is a testing utility for cmake-generated build trees.</para>
+          <para>
+            is a testing utility for cmake-generated build trees.
+          </para>
           <indexterm zone="cmake ctest">
             <primary sortas="b-ctest">ctest</primary>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ introduction/welcome/changelog.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -45,4 +45,28 @@
 -->
     <listitem>
+      <para>January 19th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Amarok 2.7.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - CMake 2.8.10.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libnl 3.2.19.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Polkit 0.110.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Taglib 1.8.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - WPA Supplicant 2.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 18th, 2013</para>
       <itemizedlist>
Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ multimedia/audioutils/amarok.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -7,7 +7,7 @@
   <!ENTITY amarok-download-http "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
   <!ENTITY amarok-download-ftp  "&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
-  <!ENTITY amarok-md5sum        "116f53c1109c7acd1ac7d78ec75c01c4">
-  <!ENTITY amarok-size          "42 MB">
-  <!ENTITY amarok-buildsize     "869 MB">
+  <!ENTITY amarok-md5sum        "4ccb750a9e86ce17d4172f770ac7a663">
+  <!ENTITY amarok-size          "41 MB">
+  <!ENTITY amarok-buildsize     "305 MB">
   <!ENTITY amarok-time          "9.2 SBU">
 ]>
@@ -30,10 +30,11 @@
     <title>Introduction to Amarok</title>
 
-    <para><application>Amarok</application> is a powerful audio player for 
-    the KDE environment.
-    Features include a context browser, integration with many online music 
-    services and support for management of several digital music players 
-    including Apple's iPod.</para>
-    
+    <para>
+      <application>Amarok</application> is a powerful audio player for 
+      the KDE environment. Features include a context browser, integration
+      with many online music  services and support for management of
+      several digital music players including Apple's iPod.
+    </para>
+
     &lfs72_checked;
 
@@ -41,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&amarok-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&amarok-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&amarok-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&amarok-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &amarok-md5sum;</para>
+        <para>
+          Download MD5 sum: &amarok-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &amarok-size;</para>
+        <para>
+          Download size: &amarok-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &amarok-buildsize;</para>
+        <para>
+          Estimated disk space required: &amarok-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &amarok-time;</para>
+        <para>
+          Estimated build time: &amarok-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,34 +77,34 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>,
-    <xref linkend="mysql"/> and
-    <xref linkend="taglib"/>
+      <xref linkend="kdelibs"/>,
+      <xref linkend="mysql"/> and
+      <xref linkend="taglib"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="ffmpeg"/>
+      <xref linkend="ffmpeg"/> and
+      <xref linkend="nepomuk-core"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="curl"/> (for MP3tunes integration),
-    <xref linkend="libxml2"/> (for MP3tunes integration),
-    <xref linkend="openssl"/> (for MP3tunes integration),
-    <xref linkend="glib2"/> (for MP3tunes integration),
-    <xref linkend="gdk-pixbuf"/> (for iPod support),
-    <ulink url="http://qjson.sourceforge.net/">QJson</ulink> (for Playdar integration),
-    <ulink url="http://www.gtkpod.org/libgpod.html">libgpod</ulink> (for iPod support),
-    <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink> (for MTP device support),
-    <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>,
-    <ulink url="http://launchpad.net/liblastfm">liblastfm</ulink> (for Last.fm integration),
-    <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
-    <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt">libmygpo-qt</ulink> (for gpodder.net podcast support) and
-    <ulink url="http://launchpad.net/loudmouth">loudmouth</ulink> (for MP3tunes integration)
+      <xref linkend="curl"/> (for MP3tunes integration),
+      <xref linkend="libxml2"/> (for MP3tunes integration),
+      <xref linkend="openssl"/> (for MP3tunes integration),
+      <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),
+      <ulink url="https://github.com/lastfm/liblastfm">liblastfm</ulink> (for Last.fm integration),
+      <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink> (for MTP device support),
+      <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="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>
     </para>
     
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/amarok"/></para>
-
+      <ulink url="&blfs-wiki;/amarok"/>
+    </para>
   </sect2>
 
@@ -99,28 +112,24 @@
     <title>Installation of Amarok</title>
 
-    <para>Install <application>Amarok</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>Amarok</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &amp;&amp;
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><parameter>- -prefix=$(kde-config - -prefix)</parameter>: This
-    parameter uses <command>kde-config</command> to establish the prefix of
-    the existing KDE installation and then sets the installation prefix for
-    <application>Amarok</application> to the same value.</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -132,14 +141,20 @@
 
       <seglistitem>
-        <seg>amarok, amarok_afttagger, amarokcollectionscanner
-        and amarokpkg</seg>
-        <seg>libamarok-sqlcollection.so, libamarok-transcoding.so, 
-	libamarokcore.so, libamaroklib.so, libamarokocsclient.so, 
-	libamarokpud.so, libampache_account_login.so and several
-	libraries in &kde-dir;/lib/kde4</seg>
-	<seg>several in &kde-dir;/share</seg>
+        <seg>
+          amarok, amarok_afttagger, amarokcollectionscanner,
+          amarokpkg and amzdownloader
+        </seg>
+        <seg>
+          libamarokcore.so, libamaroklib.so, libamarokocsclient.so, libamarokpud.so,
+          libamarok_service_lastfm_shared.so, libamarok-sqlcollection.so,
+          libamarok-transcoding.so, libampache_account_login.so and several
+          libraries in &kde-dir;/lib/kde4
+        </seg>
+	<seg>
+          several in &kde-dir;/share
+        </seg>
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -150,6 +165,8 @@
         <term><command>amarok</command></term>
         <listitem>
-          <para>is a wrapper for <command>amarokapp</command> to speed up
-          command line argument passing</para>
+          <para>
+            Is a powerful music player and organizer built on top of
+            KDE development platform.
+          </para>
           <indexterm zone="amarok amarok-prog">
             <primary sortas="b-amarok">amarok</primary>
@@ -158,47 +175,6 @@
       </varlistentry>
 
-      <varlistentry id="amarokapp">
-        <term><command>amarokapp</command></term>
-        <listitem>
-          <para>is the <application>Amarok</application> audio player</para>
-          <indexterm zone="amarok amarokapp">
-            <primary sortas="b-amarokapp">amarokapp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+    </variablelist>
 
-      <varlistentry id="amarokcollectionscanner">
-        <term><command>amarokcollectionscanner</command></term>
-        <listitem>
-          <para>is used to scan a directory structure and build a collection</para>
-          <indexterm zone="amarokcollectionscanner">
-            <primary sortas="b-amarokcollectionscanner">amarokcollectionscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amarok_daapserver.rb">
-        <term><command>amarok_daapserver.rb</command></term>
-        <listitem>
-          <para>is a DAAP server for <application>Amarok</application></para>
-          <indexterm zone="amarok amarok_daapserver.rb">
-            <primary sortas="b-amarok_daapserver.rb">amarok_daapserver.rb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amarok_proxy.rb">
-        <term><command>amarok_proxy.rb</command></term>
-        <listitem>
-          <para>is a proxy server for DAAP and
-          <ulink url="http://www.last.fm/">Last.fm</ulink></para>
-          <indexterm zone="amarok amarok_proxy.rb">
-            <primary sortas="b-amarok_proxy.rb">amarok_proxy.rb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: multimedia/libdriv/taglib.xml
===================================================================
--- multimedia/libdriv/taglib.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ multimedia/libdriv/taglib.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY taglib-download-http "http://developer.kde.org/~wheeler/files/src/taglib-&taglib-version;.tar.gz">
+  <!ENTITY taglib-download-http "https://github.com/downloads/taglib/taglib/taglib-&taglib-version;.tar.gz">
   <!ENTITY taglib-download-ftp  " ">
-  <!ENTITY taglib-md5sum        "b0a9e797d3833fb933c7c3176de3d720">
-  <!ENTITY taglib-size          "523 KB">
-  <!ENTITY taglib-buildsize     "9 MB">
+  <!ENTITY taglib-md5sum        "dcb8bd1b756f2843e18b1fdf3aaeee15">
+  <!ENTITY taglib-size          "584 KB">
+  <!ENTITY taglib-buildsize     "10 MB">
   <!ENTITY taglib-time          "0.3 SBU">
 ]>
@@ -30,7 +30,9 @@
     <title>Introduction to Taglib</title>
 
-    <para><application>Taglib</application> is a library for reading,
+    <para>
+      <application>Taglib</application> is a library used for reading,
       writing and manipulating audio file tags and is used by applications 
-      such as <application>Amarok</application> and <application>VLC</application>.
+      such as <application>Amarok</application> and
+      <application>VLC</application>.
     </para>
 
@@ -40,32 +42,34 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&taglib-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&taglib-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&taglib-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&taglib-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &taglib-md5sum;</para>
+        <para>
+          Download MD5 sum: &taglib-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &taglib-size;</para>
+        <para>
+          Download size: &taglib-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &taglib-buildsize;</para>
+        <para>
+          Estimated disk space required: &taglib-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &taglib-time;</para>
+        <para>
+          Estimated build time: &taglib-time;
+        </para>
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patches: <ulink
-        url="&patch-root;/taglib-&taglib-version;-gcc43-1.patch"/>, and <ulink
-        url="&patch-root;/taglib-&taglib-version;-test_suite-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-    -->
     
     <bridgehead renderas="sect3">Taglib Dependencies</bridgehead>
@@ -73,10 +77,10 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="cmake"/>
+      <xref linkend="cmake"/>
     </para>
     
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/taglib"/></para>
-
+      <ulink url="&blfs-wiki;/taglib"/>
+    </para>
   </sect2>
 
@@ -90,21 +94,14 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DWITH_MP4=ON \
-      -DWITH_ASF=ON \
+      -DCMAKE_BUILD_TYPE=Release  \
       .. &amp;&amp;
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>    
    
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DWITH_MP4=ON</option>: Enables support for MP4/M4A tags.</para>
-    <para><option>-DWITH_ASF=ON</option>: Enables support for WMA tags.</para>
-
   </sect2>
 
@@ -118,27 +115,16 @@
 
       <seglistitem>
-        <seg>taglib-config</seg>
-        <seg>libtag.so and libtag_c.so</seg>
-        <seg>/usr/include/taglib</seg>
+        <seg>
+          taglib-config
+        </seg>
+        <seg>
+          libtag.so and libtag_c.so
+        </seg>
+        <seg>
+          /usr/include/taglib
+        </seg>
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="id3convert">
-        <term><command>id3convert</command></term>
-        <listitem>
-          <para>converts between ID3v1/v2 tagging formats.</para>
-          <indexterm zone="taglib id3convert">
-            <primary sortas="b-id3convert">id3convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-    -->
   </sect2>
 
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ networking/netlibs/libnl.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -7,6 +7,6 @@
   <!ENTITY libnl-download-http "http://www.infradead.org/~tgr/libnl/files/libnl-&libnl-version;.tar.gz">
   <!ENTITY libnl-download-ftp  " ">
-  <!ENTITY libnl-md5sum        "f06e6de102abb2cef71ed671957ee099">
-  <!ENTITY libnl-size          "696 KB">
+  <!ENTITY libnl-md5sum        "1795c43bde05f650a43b085438e5da21">
+  <!ENTITY libnl-size          "724 KB">
   <!ENTITY libnl-buildsize     "25 MB">
   <!ENTITY libnl-time          "0.3 SBU">
@@ -146,5 +146,5 @@
 
       <varlistentry id="libnl-lib">
-        <term><filename class='libraryfile'>libnl*-3.so</filename></term>
+        <term><filename class="libraryfile">libnl*-3.so</filename></term>
         <listitem>
           <para>
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ networking/netprogs/wpa_supplicant.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -8,8 +8,8 @@
            "http://hostap.epitest.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
   <!ENTITY wpa_supplicant-download-ftp  " ">
-  <!ENTITY wpa_supplicant-md5sum        "b29b9af02d7e092db8c5c8508de0e45c">
-  <!ENTITY wpa_supplicant-size          "1.9 MB">
-  <!ENTITY wpa_supplicant-buildsize     "25 MB">
-  <!ENTITY wpa_supplicant-time          "0.1 SBU">
+  <!ENTITY wpa_supplicant-md5sum        "3be2ebfdcced52e00eda0afe2889839d">
+  <!ENTITY wpa_supplicant-size          "2.0 MB">
+  <!ENTITY wpa_supplicant-buildsize     "32 MB">
+  <!ENTITY wpa_supplicant-time          "0.2 SBU">
 ]>
 
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 91d9178bceca5aba494170372e7014ff2070dfe9)
+++ postlfs/security/polkit.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -8,5 +8,5 @@
            "http://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
   <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "8c3f08287dd3e1e546e3c2ae00090908">
+  <!ENTITY polkit-md5sum        "06e0d3b72e566ac277fc35c8206d2a28">
   <!ENTITY polkit-size          "1.4 MB">
   <!ENTITY polkit-buildsize     "17 MB">
