Index: general.ent
===================================================================
--- general.ent	(revision 9490f31ef52e83c0561e51fbde2c024a7f8221ef)
+++ general.ent	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
@@ -287,5 +287,5 @@
 <!ENTITY telepathy-glib-version       "0.18.2">
 <!ENTITY telepathy-logger-version     "0.4.0">
-<!ENTITY telepathy-mission-control-version "5.12.0">
+<!ENTITY telepathy-mission-control-version "5.12.1">
 <!ENTITY wv-version                   "1.2.9">
 
@@ -575,5 +575,5 @@
 <!ENTITY bind-version                 "9.9.1-P2">
 <!ENTITY mod_dnssd-version            "0.6">
-<!ENTITY NetworkManager-version       "0.9.4.0">
+<!ENTITY NetworkManager-version       "0.9.6.0">
 <!ENTITY nmap-version                 "5.51">
 <!ENTITY traceroute-version           "2.0.18">
@@ -815,8 +815,8 @@
 <!ENTITY gnome-themes-standard-version "3.4.2">
 <!ENTITY gnome-user-docs-version      "3.4.2">
-<!ENTITY metacity-version             "2.34.3">
+<!ENTITY metacity-version             "2.34.5">
 <!ENTITY mutter-version               "3.4.1">
 <!ENTITY nautilus-version             "3.4.2">
-<!ENTITY network-manager-applet-version "0.9.4.1">
+<!ENTITY network-manager-applet-version "0.9.6.2">
 <!ENTITY yelp-version                 "3.4.2">
 <!ENTITY zenity-version               "3.4.0">
Index: general/genlib/telepathy-mission-control.xml
===================================================================
--- general/genlib/telepathy-mission-control.xml	(revision 9490f31ef52e83c0561e51fbde2c024a7f8221ef)
+++ general/genlib/telepathy-mission-control.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
@@ -8,8 +8,8 @@
            "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
   <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "f39dcfef785a37dc21efa9af06be2e61">
-  <!ENTITY telepathy-mission-control-size          "992 KB">
-  <!ENTITY telepathy-mission-control-buildsize     "23 MB">
-  <!ENTITY telepathy-mission-control-time          "0.5 SBU">
+  <!ENTITY telepathy-mission-control-md5sum        "79449fd2e1b02fc6cb5c6adc447e2bb6">
+  <!ENTITY telepathy-mission-control-size          "1012 KB">
+  <!ENTITY telepathy-mission-control-buildsize     "26 MB">
+  <!ENTITY telepathy-mission-control-time          "0.4 SBU">
 ]>
 
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/core/metacity.xml
===================================================================
--- gnome/core/metacity.xml	(revision 9490f31ef52e83c0561e51fbde2c024a7f8221ef)
+++ gnome/core/metacity.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
@@ -7,6 +7,6 @@
   <!ENTITY metacity-download-http "&gnome-download-http;/metacity/2.34/metacity-&metacity-version;.tar.xz">
   <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/2.34/metacity-&metacity-version;.tar.xz">
-  <!ENTITY metacity-md5sum        "4b19fa5bbc14dc669108bd46606b1bd1">
-  <!ENTITY metacity-size          "1.6 MB">
+  <!ENTITY metacity-md5sum        "05468c3f674f8c338010eac23daea2e5">
+  <!ENTITY metacity-size          "1.7 MB">
   <!ENTITY metacity-buildsize     "43 MB">
   <!ENTITY metacity-time          "0.6 SBU">
@@ -31,30 +31,44 @@
     <title>Introduction to Metacity</title>
 
-    <para><application>Metacity</application> is the fallback window manager for
-    <application>GNOME</application>, used if the video driver does not provide
-    hardware acceleration. It is conventionally run from <command>gnome-session</command>,
-    which will start the necessary <application>GNOME</application> daemons.</para>
-
-    &lfs70_checked;
+    <para>
+      <application>Metacity</application> is the fallback window manager for
+      <application>GNOME</application>, used if the video driver does not provide
+      hardware acceleration. It is conventionally run from <command>gnome-session</command>,
+      which will start the necessary <application>GNOME</application> daemons.
+    </para>
+
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&metacity-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&metacity-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &metacity-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &metacity-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &metacity-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &metacity-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&metacity-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&metacity-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &metacity-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &metacity-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &metacity-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &metacity-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -89,13 +103,19 @@
     <title>Installation of Metacity</title>
 
-    <para>Install <application>Metacity</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Metacity</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --disable-static &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>
+    <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 &amp;&amp;
@@ -110,8 +130,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
+      href="../../xincludes/static-libraries.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-scrollkeeper.xml"/>
+      href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
@@ -134,6 +154,8 @@
         </seg>
         <seg>
-          /usr/include/metacity-1, /usr/share/gnome/help/creating-metacity-themes,
-          /usr/share/gnome/wm-properties, /usr/share/metacity and
+          /usr/include/metacity-1,
+          /usr/share/gnome/help/creating-metacity-themes,
+          /usr/share/gnome/wm-properties,
+          /usr/share/metacity and
           /usr/share/themes/{AgingGorilla,Atlanta,Bright,Crux,Esco,Metabox,Simple}/metacity-1
         </seg>
@@ -149,6 +171,8 @@
         <term><command>metacity</command></term>
         <listitem>
-          <para>is the <application>GNOME</application> fallback window manager,
-          used when the video driver does not support acceleration.</para>
+          <para>
+            is the <application>GNOME</application> fallback window manager,
+            used when the video driver does not support acceleration.
+          </para>
           <indexterm zone="metacity metacity-prog">
             <primary sortas="b-metacity">metacity</primary>
@@ -160,9 +184,11 @@
         <term><command>metacity-theme-viewer</command></term>
         <listitem>
-          <para>allows you to preview any installed
-          <application>Metacity</application> theme. When designing a new
-          <application>Metacity</application> theme, you can use
-          <command>metacity-theme-viewer</command> to measure the performance
-          of a window frame option, and to preview the option.</para>
+          <para>
+            allows you to preview any installed
+            <application>Metacity</application> theme. When designing a new
+            <application>Metacity</application> theme, you can use
+            <command>metacity-theme-viewer</command> to measure the performance
+            of a window frame option, and to preview the option.
+          </para>
           <indexterm zone="metacity metacity-theme-viewer">
             <primary
@@ -175,6 +201,8 @@
         <term><command>metacity-window-demo</command></term>
         <listitem>
-          <para>demonstrates various kinds of windows that window managers and
-          window manager themes should handle.</para>
+          <para>
+            demonstrates various kinds of windows that window managers and
+            window manager themes should handle.
+          </para>
           <indexterm zone="metacity metacity-window-demo">
             <primary sortas="b-metacity-window-demo">metacity-window-demo</primary>
Index: gnome/core/network-manager-applet.xml
===================================================================
--- gnome/core/network-manager-applet.xml	(revision 9490f31ef52e83c0561e51fbde2c024a7f8221ef)
+++ gnome/core/network-manager-applet.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
@@ -9,8 +9,8 @@
   <!ENTITY network-manager-applet-download-ftp  
            "&gnome-download-ftp;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum        "a8de4ace4a40e432838e434f0bf71e7a">
+  <!ENTITY network-manager-applet-md5sum        "ed996efe2739e08ece32b4ccc4e73601">
   <!ENTITY network-manager-applet-size          "1.1 MB">
   <!ENTITY network-manager-applet-buildsize     "43 MB">
-  <!ENTITY network-manager-applet-time          "0.4 SBU">
+  <!ENTITY network-manager-applet-time          "0.8 SBU">
 ]>
 
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9490f31ef52e83c0561e51fbde2c024a7f8221ef)
+++ introduction/welcome/changelog.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
@@ -67,5 +67,17 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - Metacity 2.34.5.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - NetworkManager 0.9.6.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - NetworkManager Applet 0.9.6.2.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Telepathy GLib 0.18.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Telepathy Mission Control 5.12.1.</para>
         </listitem>
         <listitem>
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 9490f31ef52e83c0561e51fbde2c024a7f8221ef)
+++ networking/netutils/networkmanager.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
@@ -9,8 +9,8 @@
   <!ENTITY NetworkManager-download-ftp  
            "&gnome-download-ftp;/NetworkManager/0.9/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "66a54b51a4998c484613911b72a7e6ff">
-  <!ENTITY NetworkManager-size          "1.8 MB">
-  <!ENTITY NetworkManager-buildsize     "65 MB">
-  <!ENTITY NetworkManager-time          "1.0 SBU">
+  <!ENTITY NetworkManager-md5sum        "85f9ed7fe08533a33c5117488f81e7ac">
+  <!ENTITY NetworkManager-size          "1.9 MB">
+  <!ENTITY NetworkManager-buildsize     "72 MB">
+  <!ENTITY NetworkManager-time          "1.8 SBU">
 ]>
 
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,20 +72,4 @@
         <para>
           Estimated build time: &NetworkManager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required Patch:
-          <ulink url="&patch-root;/NetworkManager-&NetworkManager-version;-upstream-fixes-2.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required Patch:
-          <ulink url="&patch-root;/NetworkManager-&NetworkManager-version;-lfs-1.patch"/>
         </para>
       </listitem>
@@ -97,8 +81,7 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
-      <xref linkend="iptables"/>,
       <xref linkend="libnl"/>,
       <xref linkend="nss"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev), and
+      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev), and
       <xref linkend="wireless_tools"/>
     </para>
@@ -110,4 +93,5 @@
       <xref linkend="dhcp-client"/>,
       <xref linkend="gobject-introspection"/>,
+      <xref linkend="iptables"/>,
       <xref linkend="libsoup"/> and
       <xref linkend="polkit"/>
@@ -120,5 +104,5 @@
       ModemManager</ulink>,
       <xref linkend="ppp"/> and
-      <xref linkend="wpa_supplicant"/> (Built with DBus support).
+      <xref linkend="wpa_supplicant"/> (Built with D-Bus support).
     </para>
 
@@ -136,10 +120,8 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../NetworkManager-&NetworkManager-version;-upstream-fixes-2.patch &amp;&amp;
-patch -Np1 -i ../NetworkManager-&NetworkManager-version;-lfs-1.patch &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
+            --localstatedir=/var \
             --libexecdir=/usr/lib/NetworkManager \
-            --localstatedir=/var \
             --without-systemdsystemunitdir \
             --disable-ppp &amp;&amp;
@@ -147,5 +129,5 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      This package does not come with a testsuite.
     </para>
 
