Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision ec9db95eda7252bfe7acc2a7ce9c2417eb2395c4)
+++ networking/netutils/networkmanager.xml	(revision 262a1088dd27aba55de1c68179e40fa637c094b8)
@@ -6,12 +6,11 @@
 
   <!ENTITY NetworkManager-download-http
-           "&gnome-download-http;/NetworkManager/1.10/NetworkManager-&NetworkManager-version;.tar.xz">
+           "&gnome-download-http;/NetworkManager/1.12/NetworkManager-&NetworkManager-version;.tar.xz">
   <!ENTITY NetworkManager-download-ftp
-           "&gnome-download-ftp;/NetworkManager/1.10/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "4bdcdfd05f609c2c53d3664b6573c078">
-  <!ENTITY NetworkManager-size          "3.8 MB">
-  <!ENTITY NetworkManager-buildsize     "659 MB (Add 5 MB for tests)">
-  <!ENTITY NetworkManager-time          "0.9 SBU (Using parallelism=4; add 0.3 SBU for tests)">
-  <!-- Values with tests for this release were too miniscule to add in. -->
+           "&gnome-download-ftp;/NetworkManager/1.12/NetworkManager-&NetworkManager-version;.tar.xz">
+  <!ENTITY NetworkManager-md5sum        "94d02b80b120f166927e6ef242b29a9b">
+  <!ENTITY NetworkManager-size          "4.0 MB">
+  <!ENTITY NetworkManager-buildsize     "648 MB (with tests)">
+  <!ENTITY NetworkManager-time          "2.2 SBU (with tests)">
 ]>
 
@@ -122,4 +121,5 @@
       <ulink url="http://www.thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</ulink>,
       <ulink url="http://www.digip.org/jansson/">Jansson</ulink>,
+      <ulink url="https://github.com/Distrotech/libaudit">libaudit</ulink>,
       <ulink url="https://github.com/jpirko/libteam">libteam</ulink>,
       <ulink url="https://github.com/rockdaboot/libpsl">libpsl</ulink>,
@@ -197,5 +197,5 @@
 
     <para>
-      <parameter>--with-nmtui</parameter>: This parameter enables build of
+      <parameter>--with-nmtui</parameter>: This parameter enables building
       <command>nmtui</command>.
     </para>
@@ -381,17 +381,17 @@
         </seg>
         <seg>
-          libnm-glib.so, libnm-glib-vpn.so, libnm.so, libnm-util.so, and
-          modules under /usr/lib/NetworkManager
+          libnm.so and several modules under /usr/lib/NetworkManager
         </seg>
         <seg>
           /etc/NetworkManager,
-          /usr/include/{libnm,libnm-glib,NetworkManager},
+          /usr/include/libnm,
           /usr/lib/NetworkManager,
           /usr/share/doc/NetworkManager-&NetworkManager-version;,
-	  /usr/share/gtk-doc/html/{libnm,libnm-glib,libnm-util,NetworkManager}
+	  /usr/share/gtk-doc/html/{libnm,NetworkManager}
 	  (if the documentation is built),
           and
-          /var/{lib,run}/NetworkManager
+          /var/lib/NetworkManager
         </seg>
+        <!-- A lot of libraries were removed here. We should verify compatibilty. -->
       </seglistitem>
     </segmentedlist>
@@ -490,38 +490,12 @@
       </varlistentry>
 
-      <varlistentry id="libnm-glib">
-        <term><filename class="libraryfile">libnm-glib.so</filename></term>
+      <varlistentry id="libnm">
+        <term><filename class="libraryfile">libnm.so</filename></term>
         <listitem>
           <para>
             contains functions used by <application>NetworkManager</application>.
           </para>
-          <indexterm zone="NetworkManager libnm-glib">
-            <primary sortas="c-libnm-glib">libnm-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnm-glib-vpn">
-        <term><filename class="libraryfile">libnm-glib-vpn.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <application>NetworkManager</application>
-            VPN plugins.
-          </para>
-          <indexterm zone="NetworkManager libnm-glib-vpn">
-            <primary sortas="c-libnm-glib-vpn">libnm-glib-vpn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnm-util">
-        <term><filename class="libraryfile">libnm-util.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <application>NetworkManager</application>
-            utilities.
-          </para>
-          <indexterm zone="NetworkManager libnm-util">
-            <primary sortas="c-libnm-util">libnm-util.so</primary>
+          <indexterm zone="NetworkManager libnm">
+            <primary sortas="c-libnm">libnm.so</primary>
           </indexterm>
         </listitem>
