Index: networking/connect/connect.xml
===================================================================
--- networking/connect/connect.xml	(revision abf6e26b59b5c0234b5da410ad934a5c34daf73e)
+++ networking/connect/connect.xml	(revision c1cacc30871c2d2d87552110037966f4bec03aca)
@@ -33,5 +33,5 @@
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppp.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp-systemd.xml"/>
 
Index: networking/connect/dhcpcd-systemd.xml
===================================================================
--- networking/connect/dhcpcd-systemd.xml	(revision c1cacc30871c2d2d87552110037966f4bec03aca)
+++ networking/connect/dhcpcd-systemd.xml	(revision c1cacc30871c2d2d87552110037966f4bec03aca)
@@ -0,0 +1,169 @@
+<?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 dhcpcd-download-http "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
+  <!ENTITY dhcpcd-download-ftp  " ">
+  <!--<!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">-->
+  <!ENTITY dhcpcd-md5sum        "3ba26bd6e0cd2f973bfbcd3c08ebc93b">
+  <!ENTITY dhcpcd-size          "148 KB">
+  <!ENTITY dhcpcd-buildsize     "2.2 MB">
+  <!ENTITY dhcpcd-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
+  <?dbhtml filename="dhcpcd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>dhcpcd-&dhcpcd-version;</title>
+
+  <indexterm zone="dhcpcd">
+    <primary sortas="a-dhcpcd">dhcpcd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to dhcpcd</title>
+
+    <para><application>dhcpcd</application> is an implementation of the
+    DHCP client specified in RFC2131. A DHCP client is useful for connecting
+    your computer to a network which uses DHCP to assign network
+    addresses. dhcpcd strives to be a fully featured, yet very lightweight
+    DHCP client.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&dhcpcd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&dhcpcd-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &dhcpcd-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &dhcpcd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &dhcpcd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &dhcpcd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/dhcpcd"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of dhcpcd</title>
+
+    <para>Install <application>dhcpcd</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --libexecdir=/lib/dhcpcd \
+            --dbdir=/var/tmp         &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>
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+<!--
+    <para>By default, a plain text lease info file isn't created but the
+    <application>dhcpcd</application> provides a hook which can be used for creating
+    such a file. Install the hook by running the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>sed -i "s;/var/lib;/run;g" dhcpcd-hooks/50-dhcpcd-compat &amp;&amp;
+install -v -m 644 dhcpcd-hooks/50-dhcpcd-compat /lib/dhcpcd/dhcpcd-hooks/</userinput></screen>
+-->
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--libexecdir=/lib/dhcpcd</parameter>: The default
+      <filename class="directory">/libexec</filename> is not FHS-compliant.
+      Since this directory may need to be available early in the boot,
+      <filename class="directory">/usr/libexec</filename> cannot be used either.
+    </para>
+
+    <para>
+      <parameter>--dbdir=/var/tmp</parameter>: The default
+      <filename class="directory">/var/lib</filename> is not FHS-compliant
+    </para>
+
+    <para>
+      <option>--with-hook=...</option>: You can optionally install more hooks,
+      for example to install some configuration files such as
+      <filename>ntp.conf</filename>. The set of hooks is in the
+      <filename class="directory">dhcpcd-hooks</filename> directory in the
+      build tree.
+    </para>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>dhcpcd</seg>
+        <seg>/lib/dhcpcd/dev/udev.so</seg>
+        <seg>/lib/dhcpcd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="dhcpcd-prog">
+        <term><command>dhcpcd</command></term>
+        <listitem>
+          <para>is an implementation of the DHCP client specified
+          in RFC2131.</para>
+          <indexterm zone="dhcpcd dhcpcd-prog">
+            <primary sortas="b-dhcpcd">dhcpcd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dhcpcd-udev">
+        <term><filename class="libraryfile">udev.so</filename></term>
+        <listitem>
+          <para>
+            add udev support for interface arrival and departure; this is
+            because udev likes to rename the interface, which it can't do if
+            dhcpcd grabs it first.
+          </para>
+          <indexterm zone="dhcpcd dhcpcd-udev">
+            <primary sortas="c-dhcpcd-udev">udev.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/connect/dhcpcd.xml
===================================================================
--- networking/connect/dhcpcd.xml	(revision abf6e26b59b5c0234b5da410ad934a5c34daf73e)
+++ 	(revision )
@@ -1,290 +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 dhcpcd-download-http "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
-  <!ENTITY dhcpcd-download-ftp  " ">
-  <!--<!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">-->
-  <!ENTITY dhcpcd-md5sum        "3ba26bd6e0cd2f973bfbcd3c08ebc93b">
-  <!ENTITY dhcpcd-size          "148 KB">
-  <!ENTITY dhcpcd-buildsize     "2.2 MB">
-  <!ENTITY dhcpcd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
-  <?dbhtml filename="dhcpcd.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>dhcpcd-&dhcpcd-version;</title>
-
-  <indexterm zone="dhcpcd">
-    <primary sortas="a-dhcpcd">dhcpcd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dhcpcd</title>
-
-    <para><application>dhcpcd</application> is an implementation of the
-    DHCP client specified in RFC2131. A DHCP client is useful for connecting
-    your computer to a network which uses DHCP to assign network
-    addresses. dhcpcd strives to be a fully featured, yet very lightweight
-    DHCP client.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&dhcpcd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&dhcpcd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &dhcpcd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &dhcpcd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &dhcpcd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &dhcpcd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/dhcpcd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dhcpcd</title>
-
-    <para>Install <application>dhcpcd</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --libexecdir=/lib/dhcpcd \
-            --dbdir=/var/tmp         &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>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-<!--
-    <para>By default, a plain text lease info file isn't created but the
-    <application>dhcpcd</application> provides a hook which can be used for creating
-    such a file. Install the hook by running the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>sed -i "s;/var/lib;/run;g" dhcpcd-hooks/50-dhcpcd-compat &amp;&amp;
-install -v -m 644 dhcpcd-hooks/50-dhcpcd-compat /lib/dhcpcd/dhcpcd-hooks/</userinput></screen>
--->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/lib/dhcpcd</parameter>: The default
-      <filename class="directory">/libexec</filename> is not FHS-compliant.
-      Since this directory may need to be available early in the boot,
-      <filename class="directory">/usr/libexec</filename> cannot be used either.
-    </para>
-
-    <para>
-      <parameter>--dbdir=/var/tmp</parameter>: The default
-      <filename class="directory">/var/lib</filename> is not FHS-compliant
-    </para>
-
-    <para>
-      <option>--with-hook=...</option>: You can optionally install more hooks,
-      for example to install some configuration files such as
-      <filename>ntp.conf</filename>. The set of hooks is in the
-      <filename class="directory">dhcpcd-hooks</filename> directory in the
-      build tree.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring dhcpcd</title>
-
-    <sect3 id="dhcpcd-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/dhcpcd.conf</filename></para>
-
-      <indexterm zone="dhcpcd dhcpcd-config">
-        <primary sortas="e-etc-dhcpcd-dhcpcd-conf">/etc/dhcpcd/dhcpcd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="dhcpcd-init">
-      <title>General Configuration Information</title>
-
-      <para>To configure <command>dhcpcd</command>, you need to first install
-      the network service script,
-      <filename>/lib/services/dhcpcd</filename>
-      included in the <xref linkend="bootscripts"/> package
-      (as user <systemitem class="username">root</systemitem>):</para>
-
-      <indexterm zone="dhcpcd dhcpcd-init">
-        <primary sortas="f-dhcpcd">dhcpcd (service script)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>make install-service-dhcpcd</userinput></screen>
-
-      <para>Whenever <command>dhcpcd</command> configures or shuts down
-      a network interface, it executes hook scripts. For more details
-      about those scripts, see the <command>dhcpcd-run-hooks</command> and
-      <command>dhcpcd</command> man pages.</para>
-
-      <para id="dhcpcd-config2">Finally, as the <systemitem
-      class="username">root</systemitem> user create the
-      <filename>/etc/sysconfig/ifconfig.eth0</filename>
-      configuration file using the following commands.  Adjust appropriately
-      for additional interfaces:</para>
-
-      <indexterm zone="dhcpcd dhcpcd-config2">
-        <primary sortas="e-etc-sysconfig-dhcpcd">/etc/sysconfig/ifconfig.eth0 (dhcpcd)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhcpcd"
-DHCP_START="-b -q <replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
-DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <para>For more information on the appropriate <envar>DHCP_START</envar> and
-      <envar>DHCP_STOP</envar> values, examine the man page for
-      <command>dhcpcd</command>.</para>
-
-      <note>
-
-        <para id="dhcpcd-config3">The default behavior of
-        <command>dhcpcd</command> sets the hostname and mtu settings.  It also
-        overwrites <filename>/etc/resolv.conf</filename> and
-        <filename>/etc/ntp.conf</filename>.
-
-        These modifications to system files and settings on system
-        configuration files are done by hooks which are stored in <filename
-        class="directory">/lib/dhcpcd/dhcpcd-hooks</filename>.
-
-        Setup <command>dhcpcd</command> by removing or adding hooks from/to
-        that directory.  The execution of hooks can be disabled by using the
-        <option>--nohook</option> (<option>-C</option>) command line option or
-        by the <option>nohook</option> option in the
-        <filename>/etc/dhcpcd.conf</filename> file.</para>
-
-        <para>Review the <command>dhcpcd</command> man page for switches to add
-        to the <envar>DHCP_START</envar> value.</para>
-
-      </note>
-
-      <indexterm zone="dhcpcd dhcpcd-config3">
-        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 id="dhcpcd-init2">
-      <title>Configuration Information: fixed ip</title>
-
-      <para id="dhcpcd-config4">Although not usual, it is possible that you need
-        to configure <application>dhcpcd</application> to use a fixed ip. Here,
-        we give an example. As the
-        <systemitem class="username">root</systemitem> user create the
-        <filename>/etc/sysconfig/ifconfig.eth0</filename> configuration file
-        using the following commands.  Adjust appropriately for additional
-        interfaces and for the actual ip and router you need:</para>
-
-      <indexterm zone="dhcpcd dhcpcd-config4">
-        <primary sortas="e-etc-sysconfig-dhcpcd">/etc/sysconfig/ifconfig.eth0 (dhcpcd)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhcpcd"
-DHCP_START="-b -q -S ip_address=192.168.0.10/24 -S routers=192.168.0.1"
-DHCP_STOP="-k"</literal>
-EOF</userinput></screen>
-
-      <para>You can either use DNS servers in
-        <filename>/etc/resolv.conf</filename> from another system, your
-        preferred servers, or just the example
-        <filename>/etc/resolv.conf.head</filename> file below as is:</para>
-
-<screen role='root'><userinput>cat &gt; /etc/resolv.conf.head &lt;&lt; "EOF"
-<literal># OpenDNS servers
-nameserver 208.67.222.222
-nameserver 208.67.220.220</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>dhcpcd</seg>
-        <seg>/lib/dhcpcd/dev/udev.so</seg>
-        <seg>/lib/dhcpcd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dhcpcd-prog">
-        <term><command>dhcpcd</command></term>
-        <listitem>
-          <para>is an implementation of the DHCP client specified
-          in RFC2131.</para>
-          <indexterm zone="dhcpcd dhcpcd-prog">
-            <primary sortas="b-dhcpcd">dhcpcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dhcpcd-udev">
-        <term><filename class="libraryfile">udev.so</filename></term>
-        <listitem>
-          <para>
-            add udev support for interface arrival and departure; this is
-            because udev likes to rename the interface, which it can't do if
-            dhcpcd grabs it first.
-          </para>
-          <indexterm zone="dhcpcd dhcpcd-udev">
-            <primary sortas="c-dhcpcd-udev">udev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/bridgeutils-systemd.xml
===================================================================
--- networking/netprogs/bridgeutils-systemd.xml	(revision c1cacc30871c2d2d87552110037966f4bec03aca)
+++ networking/netprogs/bridgeutils-systemd.xml	(revision c1cacc30871c2d2d87552110037966f4bec03aca)
@@ -0,0 +1,156 @@
+<?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 bridge-download-http "&sourceforge-repo2;/projects/bridge/files/bridge/bridge-utils-&bridgeutils-version;.tar.gz">
+  <!ENTITY bridge-download-ftp  " ">
+  <!ENTITY bridge-md5sum        "ec7b381160b340648dede58c31bb2238">
+  <!ENTITY bridge-size          "36 KB">
+  <!ENTITY bridge-buildsize     "1 MB">
+  <!ENTITY bridge-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="bridgeutils" xreflabel="bridge-utils-&bridgeutils-version;">
+  <?dbhtml filename="bridge-utils.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>bridge-utils-&bridgeutils-version;</title>
+
+  <indexterm zone="bridgeutils">
+    <primary sortas="a-bridgeutils">bridge-utils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to bridge-utils</title>
+
+    <para>The <application>bridge-utils</application> package contains a utility
+    needed to create and manage bridge devices.  This is useful in setting up
+    networks for a hosted virtual machine (VM).</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&bridge-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&bridge-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &bridge-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &bridge-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &bridge-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &bridge-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/bridge-utils-&bridgeutils-version;-linux_3.8_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">bridge-utils Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional (to run tests)</bridgehead>
+    <para role="optional">
+      <xref linkend="net-tools"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bridge"/></para>
+
+  </sect2>
+
+  <sect2 role="kernel" id='bridgeutils-kernel'>
+    <title>Kernel Configuration</title>
+
+    <para>Enable the following options in the kernel configuration
+    and recompile the kernel if necessary:</para>
+
+<screen><literal>Networking support: Y
+  Networking options:
+    802.1d Ethernet Bridging: M or Y</literal></screen>
+
+    <indexterm zone="bridgeutils bridgeutils-kernel">
+      <primary sortas="d-bridgeutils">Bridge Utilities</primary>
+    </indexterm>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of bridge-utils</title>
+
+    <para>Install <application>bridge-utils</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../bridge-utils-&bridgeutils-version;-linux_3.8_fix-1.patch &amp;&amp;
+autoconf -o configure configure.in                      &amp;&amp;
+./configure --prefix=/usr                               &amp;&amp;
+make</userinput></screen>
+
+    <para>Testing the results requires running the six shell scripts in
+    the <filename class='directory'>tools/</filename> directory.
+    Two of the tests require two ethernet ports.  Some tests
+    will not preserve the current network configuration.  See
+    <filename>tests/README</filename> for details.</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 Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>brctl</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="brctl">
+        <term><command>brctl</command></term>
+        <listitem>
+          <para>is a program  used to set up, maintain, and inspect the
+          ethernet bridge configuration in the linux kernel.  </para>
+          <indexterm zone="bridgeutils brctl">
+            <primary sortas="b-brctl">brctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/bridgeutils.xml
===================================================================
--- networking/netprogs/bridgeutils.xml	(revision abf6e26b59b5c0234b5da410ad934a5c34daf73e)
+++ 	(revision )
@@ -1,219 +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 bridge-download-http "&sourceforge-repo2;/projects/bridge/files/bridge/bridge-utils-&bridgeutils-version;.tar.gz">
-  <!ENTITY bridge-download-ftp  " ">
-  <!ENTITY bridge-md5sum        "ec7b381160b340648dede58c31bb2238">
-  <!ENTITY bridge-size          "36 KB">
-  <!ENTITY bridge-buildsize     "1 MB">
-  <!ENTITY bridge-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="bridgeutils" xreflabel="bridge-utils-&bridgeutils-version;">
-  <?dbhtml filename="bridge-utils.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>bridge-utils-&bridgeutils-version;</title>
-
-  <indexterm zone="bridgeutils">
-    <primary sortas="a-bridgeutils">bridge-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to bridge-utils</title>
-
-    <para>The <application>bridge-utils</application> package contains a utility
-    needed to create and manage bridge devices.  This is useful in setting up
-    networks for a hosted virtual machine (VM).</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&bridge-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&bridge-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &bridge-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &bridge-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &bridge-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &bridge-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/bridge-utils-&bridgeutils-version;-linux_3.8_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">bridge-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (to run tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="net-tools"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/bridge"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='bridgeutils-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>Enable the following options in the kernel configuration
-    and recompile the kernel if necessary:</para>
-
-<screen><literal>Networking support: Y
-  Networking options:
-    802.1d Ethernet Bridging: M or Y</literal></screen>
-
-    <indexterm zone="bridgeutils bridgeutils-kernel">
-      <primary sortas="d-bridgeutils">Bridge Utilities</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of bridge-utils</title>
-
-    <para>Install <application>bridge-utils</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../bridge-utils-&bridgeutils-version;-linux_3.8_fix-1.patch &amp;&amp;
-autoconf -o configure configure.in                      &amp;&amp;
-./configure --prefix=/usr                               &amp;&amp;
-make</userinput></screen>
-
-    <para>Testing the results requires running the six shell scripts in
-    the <filename class='directory'>tools/</filename> directory.
-    Two of the tests require two ethernet ports.  Some tests
-    will not preserve the current network configuration.  See
-    <filename>tests/README</filename> for details.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring bridge-utils</title>
-
-    <sect3 id='bridgeutils-init'>
-      <title>Configuration Information</title>
-
-      <para>To automate bridge creation and configuration,
-      install the <filename>/lib/services/etc/bridge</filename>
-      service script included in the <xref linkend="bootscripts"/>
-      package.</para>
-
-      <indexterm zone="bridgeutils bridgeutils-init">
-        <primary sortas="f-bridgeutils">bridge-utils</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-service-bridge</userinput></screen>
-
-      <note><para>The <filename>bridge</filename> script depends
-      on the commands <command>/sbin/ifup</command> and
-      <command>/sbin/ifdown</command> and the service script
-      <emphasis>ipv4-static</emphasis> from the <emphasis>LFS</emphasis>
-      bootscripts dated January 27, 2012 or later.</para></note>
-
-      <para>The following configuration file will create a bridge device at
-      boot time and attach the eth0 device to it.  If more than one device is
-      desired, use a space separated list of INTERFACE_COMPONENTS.  This
-      configuration is useful when planning to run a virtual machine such as
-      kvm/qemu.</para>
-
-      <para>Other SERVICE combinations are possible, for example,
-      SERVICES="bridge dhcp".  In that case, the address parameters
-      are not needed, but do not interfere if present. The
-      bridge service may also be used alone, but will require
-      additional subsequent configuration.</para>
-
-      <caution><para>Do not run a parallel configuration for a device in the
-      INTERFACE_COMPONENTS list.  For instance, in the example below, do not
-      configure <filename>/etc/sysconfig/ifconfig.eth0</filename> to run at
-      boot time.  The command <command>ifdown br0</command> followed by
-      command <command>ifup eth0</command> will work, but don't try to have
-      both up at the same time.</para></caution>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.br0 &lt;&lt; "EOF"
-<literal>ONBOOT=yes
-IFACE=br0
-SERVICE="bridge ipv4-static"  # Space separated
-IP=192.168.1.32
-GATEWAY=192.168.1.1
-PREFIX=24
-BROADCAST=192.168.1.255
-CHECK_LINK=no                 # Don't check before bridge is created
-STP=no                        # Spanning tree protocol, default no
-INTERFACE_COMPONENTS="eth0"   # Add to IFACE, space separated devices
-IP_FORWARD=true</literal>
-EOF</userinput></screen>
-
-      <para>All addresses should be changed to meet your circumstance.</para>
-
-    </sect3>
-
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>brctl</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="brctl">
-        <term><command>brctl</command></term>
-        <listitem>
-          <para>is a program  used to set up, maintain, and inspect the
-          ethernet bridge configuration in the linux kernel.  </para>
-          <indexterm zone="bridgeutils brctl">
-            <primary sortas="b-brctl">brctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/netprogs.xml
===================================================================
--- networking/netprogs/netprogs.xml	(revision abf6e26b59b5c0234b5da410ad934a5c34daf73e)
+++ networking/netprogs/netprogs.xml	(revision c1cacc30871c2d2d87552110037966f4bec03aca)
@@ -21,10 +21,10 @@
   are support programs for daemons that you may have running on your machine.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bridgeutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bridgeutils-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cifsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncftp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rpcbind-systemd.xml"/>
