Index: BOOK/network/alpha-chapter.xml
===================================================================
--- BOOK/network/alpha-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/alpha-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/common/choose.xml
===================================================================
--- BOOK/network/common/choose.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/common/choose.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -9,5 +9,5 @@
   <?dbhtml filename="choose.html"?>
 
-  <title>DHCP or Static Networking?</title>
+  <title>Systemd Networking?</title>
 
   <indexterm zone="ch-network-choose">
@@ -24,7 +24,7 @@
   responsible for setting up your options.</para>
 
-  <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+  <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
 
-  <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+  <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-scripts-network-scripts"/>.</para>
 
 </sect1>
Index: BOOK/network/common/dhcp.xml
===================================================================
--- BOOK/network/common/dhcp.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ 	(revision )
@@ -1,65 +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;
-]>
-
-<sect1 id="ch-network-dhcp">
-  <?dbhtml filename="network-dhcp.html"?>
-
-  <title>DHCP Network Configuration</title>
-
-  <sect2>
-    <title>Creating the DHCP Network Interface Configuration File</title>
-
-    <para>The following is an example for the eth0 interface. Refer to the
-    dhcpcd.conf man page for more information. This step may be skipped if
-    default behavior of dhcpcd is required.</para>
-
-    <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
-    using the following commands. Adjust appropriately for additional options:</para>
-
-<screen><userinput>cd /etc &amp;&amp;
-cat &gt; dhcpcd.conf &lt;&lt; "EOF"
-<literal># dhcpcd configuration eth0 interface
-# See dhcpcd.conf(5) for details.
-
-interface eth0
-# dhcpcd-run-hooks uses these options.
-option subnet_mask, routers, domain_name_servers
-
-# The default timeout for waiting for a DHCP response is 30 seconds
-# which may be too long or too short and can be changed here.
-timeout 16</literal>
-EOF</userinput></screen>
-
-    <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring the Network Interface at boot</title>
-
-    <para>Enabling of the Network Interface configuration is
-    done per interface. To enable Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable dhcpcd@eth0</userinput></screen>
-
-    <para>To disable previously enabled Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable dhcpcd@eth0</userinput></screen>
-
-    <para>To manually start the Network Interface configuration,
-    run:</para>
-
-<screen role="nodump"><userinput>systemctl start dhcpcd@eth0</userinput></screen>
-
-    <para>Replace eth0 with the correct Network Interface
-    name as described on the beginning of this page.</para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/network/common/dhcpcd.xml
===================================================================
--- BOOK/network/common/dhcpcd.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/common/dhcpcd.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -46,4 +46,56 @@
   </sect2>
 
+  <sect2 id="conf-dhcpcd" role="configuration">
+    <title>Creating the DHCP Network Interface Configuration File</title>
+
+    <para>The following is an example for the eth0 interface. Refer to the
+    dhcpcd.conf man page for more information. This step may be skipped if
+    default behavior of dhcpcd is required.</para>
+
+    <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
+    using the following commands. Adjust appropriately for additional options:</para>
+
+<screen><userinput>cd /etc &amp;&amp;
+cat &gt; dhcpcd.conf &lt;&lt; "EOF"
+<literal># dhcpcd configuration eth0 interface
+# See dhcpcd.conf(5) for details.
+
+interface eth0
+# dhcpcd-run-hooks uses these options.
+option subnet_mask, routers, domain_name_servers
+
+# The default timeout for waiting for a DHCP response is 30 seconds
+# which may be too long or too short and can be changed here.
+timeout 16</literal>
+EOF</userinput></screen>
+
+    <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+
+  </sect2>
+
+  <sect2>
+    <title>Configuring the Network Interface at boot</title>
+
+    <para>Enabling of the Network Interface configuration is
+    done per interface. To enable Network Interface
+    configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl enable dhcpcd@eth0</userinput></screen>
+
+    <para>To disable previously enabled Network Interface
+    configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl disable dhcpcd@eth0</userinput></screen>
+
+    <para>To manually start the Network Interface configuration,
+    run:</para>
+
+<screen role="nodump"><userinput>systemctl start dhcpcd@eth0</userinput></screen>
+
+    <para>Replace eth0 with the correct Network Interface
+    name as described on the beginning of this page.</para>
+
+  </sect2>
+
   <sect2 id="contents-dhcpcd" role="content">
     <title>Contents of dhcpcd</title>
Index: BOOK/network/common/static.xml
===================================================================
--- BOOK/network/common/static.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ 	(revision )
@@ -1,105 +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;
-]>
-
-<sect1 id="ch-network-static">
-  <?dbhtml filename="network-static.html"?>
-
-  <title>Static Networking Configuration</title>
-
-  <sect2>
-    <title>Creating the Static Network Interface Configuration Files</title>
-
-    <para>Which interfaces are brought up and down by the network script
-    depends on the files and directories in the <filename
-    class="directory">/etc/sysconfig</filename> hierarchy.
-    This directory should contain a sub-directory for each interface to be
-    configured, such as <filename>ifconfig.xyz</filename>, where
-    <quote>xyz</quote> is a network interface name. Inside this directory
-    would be files defining the attributes to this interface, such as its IP
-    address(es), subnet masks, and so forth.</para>
-
-    <note><para>Udev may assign random Network Card Interface names
-    for some network cards such as enp2s1. If you are not sure what
-    your Network Card Interface name is, you can always run
-    <command>ip l</command> after you have booted your system. Again,
-    it is important that <filename>ifconfig.xyz</filename> is named
-    after correct Network Card Interface name (e.g.
-    <filename>ifconfig.enp2s1</filename> or
-    <filename>ifconfig.eth0</filename>) or Systemd will fail to bring
-    up your network interface.</para></note>
-
-    <para>The following command creates a sample <filename>ipv4</filename>
-    file for the <emphasis>eth0</emphasis> device:</para>
-
-<screen><userinput>mkdir -pv /etc/sysconfig &amp;&amp;
-cd /etc/sysconfig &amp;&amp;
-cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
-<literal>IFACE="eth0"
-SERVICE="ipv4-static"
-IP="192.168.1.1"
-GATEWAY="192.168.1.2"
-PREFIX="24"
-BROADCAST="192.168.1.255"</literal>
-EOF</userinput></screen>
-
-    <para os="var-ob">The values of these variables must be changed in every
-    file to match the proper setup.</para>
-
-    <para os="var-i">The <envar>IFACE</envar> variable defines the interface
-    name, for example, eth0. It is required for all network device configuration
-    files.</para>
-
-    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
-    for obtaining the IP address. The CLFS-Network-Scripts package has a modular
-    IP assignment format, and creating additional files in the <filename
-    class="directory">/lib/services</filename>
-    directory allows other IP assignment methods.</para>
-
-    <para>The <envar>GATEWAY</envar> variable should contain the default
-    gateway IP address, if one is present. If not, then comment out the
-    variable entirely.</para>
-
-    <para>The <envar>PREFIX</envar> variable needs to contain the number of
-    bits used in the subnet. Each octet in an IP address is 8 bits. If the
-    subnet's netmask is 255.255.255.0, then it is using the first three octets
-    (24 bits) to specify the network number. If the netmask is 255.255.255.240,
-    it would be using the first 28 bits.  Prefixes longer than 24 bits are
-    commonly used by DSL and cable-based Internet Service Providers (ISPs).
-    In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
-    <envar>PREFIX</envar> variable according to your specific subnet.</para>
-
-    <para>For more information see the <command>ifup</command> man page.</para>
-
-    <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcp"/>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring the Network Interface at boot</title>
-
-    <para>Enabling of the Network Interface configuration is
-    done per interface. To enable Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable ifupdown@eth0</userinput></screen>
-
-    <para>To disable previously enabled Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable ifupdown@eth0</userinput></screen>
-
-    <para>To manually start the Network Interface configuration,
-    run:</para>
-
-<screen role="nodump"><userinput>systemctl start ifupdown@eth0</userinput></screen>
-
-    <para>Replace eth0 with the correct Network Interface
-    name as described on the beginning of this page.</para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/network/common/sysconfig-network.xml
===================================================================
--- BOOK/network/common/sysconfig-network.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/common/sysconfig-network.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -0,0 +1,105 @@
+<?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;
+]>
+
+<sect1 id="ch-network-static">
+  <?dbhtml filename="network-static.html"?>
+
+  <title>Static Networking Configuration</title>
+
+  <sect2>
+    <title>Creating the Static Network Interface Configuration Files</title>
+
+    <para>Which interfaces are brought up and down by the network script
+    depends on the files and directories in the <filename
+    class="directory">/etc/sysconfig</filename> hierarchy.
+    This directory should contain a sub-directory for each interface to be
+    configured, such as <filename>ifconfig.xyz</filename>, where
+    <quote>xyz</quote> is a network interface name. Inside this directory
+    would be files defining the attributes to this interface, such as its IP
+    address(es), subnet masks, and so forth.</para>
+
+    <note><para>Udev may assign random Network Card Interface names
+    for some network cards such as enp2s1. If you are not sure what
+    your Network Card Interface name is, you can always run
+    <command>ip l</command> after you have booted your system. Again,
+    it is important that <filename>ifconfig.xyz</filename> is named
+    after correct Network Card Interface name (e.g.
+    <filename>ifconfig.enp2s1</filename> or
+    <filename>ifconfig.eth0</filename>) or Systemd will fail to bring
+    up your network interface.</para></note>
+
+    <para>The following command creates a sample <filename>ipv4</filename>
+    file for the <emphasis>eth0</emphasis> device:</para>
+
+<screen><userinput>mkdir -pv /etc/sysconfig &amp;&amp;
+cd /etc/sysconfig &amp;&amp;
+cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
+<literal>IFACE="eth0"
+SERVICE="ipv4-static"
+IP="192.168.1.1"
+GATEWAY="192.168.1.2"
+PREFIX="24"
+BROADCAST="192.168.1.255"</literal>
+EOF</userinput></screen>
+
+    <para os="var-ob">The values of these variables must be changed in every
+    file to match the proper setup.</para>
+
+    <para os="var-i">The <envar>IFACE</envar> variable defines the interface
+    name, for example, eth0. It is required for all network device configuration
+    files.</para>
+
+    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
+    for obtaining the IP address. The CLFS-Network-Scripts package has a modular
+    IP assignment format, and creating additional files in the <filename
+    class="directory">/lib/services</filename>
+    directory allows other IP assignment methods.</para>
+
+    <para>The <envar>GATEWAY</envar> variable should contain the default
+    gateway IP address, if one is present. If not, then comment out the
+    variable entirely.</para>
+
+    <para>The <envar>PREFIX</envar> variable needs to contain the number of
+    bits used in the subnet. Each octet in an IP address is 8 bits. If the
+    subnet's netmask is 255.255.255.0, then it is using the first three octets
+    (24 bits) to specify the network number. If the netmask is 255.255.255.240,
+    it would be using the first 28 bits.  Prefixes longer than 24 bits are
+    commonly used by DSL and cable-based Internet Service Providers (ISPs).
+    In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
+    <envar>PREFIX</envar> variable according to your specific subnet.</para>
+
+    <para>For more information see the <command>ifup</command> man page.</para>
+
+    <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+
+  </sect2>
+
+  <sect2>
+    <title>Configuring the Network Interface at boot</title>
+
+    <para>Enabling of the Network Interface configuration is
+    done per interface. To enable Network Interface
+    configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl enable ifupdown@eth0</userinput></screen>
+
+    <para>To disable previously enabled Network Interface
+    configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl disable ifupdown@eth0</userinput></screen>
+
+    <para>To manually start the Network Interface configuration,
+    run:</para>
+
+<screen role="nodump"><userinput>systemctl start ifupdown@eth0</userinput></screen>
+
+    <para>Replace eth0 with the correct Network Interface
+    name as described on the beginning of this page.</para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/network/common/systemd-network.xml
===================================================================
--- BOOK/network/common/systemd-network.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/common/systemd-network.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -0,0 +1,71 @@
+<?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;
+]>
+
+<sect1 id="ch-systemd-network">
+  <?dbhtml filename="systemd-network.html"?>
+
+  <title>Networking Configuration with Systemd-networkd</title>
+
+  <sect2 role="static">
+    <title>Creating the Static Network Interface Configuration Files</title>
+
+    <note><para>Udev may assign random Network Card Interface names
+    for some network cards such as enp2s1. If you are not sure what
+    your Network Card Interface name is, you can always run
+    <command>ip l</command> after you have booted your system. It is important that the <envar>Name</envar> variable in  <filename>/etc/systemd/network</filename> contain the correct Network Card Interface name (e.g.
+    <envar>Name=enp2s1</envar> or
+    <envar>Name=eth0</envar>) or Systemd will fail to bring
+    up your network interface.</para></note>
+
+    <para><command>systemd-networkd</command> uses <filename>/etc/system/network</filename> for configuration files. Refer to systemd.network(5) and systemd.netdev(5). Configure a network interface with a config file. Adjust Name= as required:</para>
+
+<screen><userinput>cd /etc/systemd/network &amp;&amp;
+cat &gt; static.network &lt;&lt; "EOF"
+[Match]
+Name=enp2s0
+
+[Network]
+Address=192.168.1.1/24
+Gateway=192.168.1.2
+EOF</userinput></screen>
+
+    <para os="var-ob">The values of these variables must be changed in every
+    file to match the proper setup.</para>
+
+    <para os="var-i">The <envar>Name</envar> variable defines the interface
+    name, for example, eth0. It is required for all network device configuration
+    files.</para>
+
+    <para>The <envar>Gateway</envar> variable should contain the default
+    gateway IP address, if one is present. If not, then comment out the
+    variable entirely.</para>
+
+    <para>For more information see the <command>systemd.netdev</command> man page.</para>
+
+  </sect2>
+
+  <sect2 role="dhcp">
+    <title>Connecting to a network with DHCP</title>
+
+  <para><command>systemd-networkd</command> uses <filename>/etc/systemd/network</filename> for configuration files. Refer to <filename>systemd.network(5)</filename> and <filename>systemd.netdev(5)</filename>. Configure a network interface with a config file. Adjust Name= as required:</para>
+
+<screen><userinput>cd /etc/systemd/network &amp;&amp;
+cat &gt; dhcp.network &lt;&lt; "EOF"
+[Match]
+Name=enp2s0
+
+[Network]
+DHCP=yes
+EOF</userinput></screen>
+
+  <para><command>systemd-networkd</command> will automatically configure <filename>/run/systemd/network/resolv.conf</filename> when using DHCP. If you did not manually create <filename>/etc/resolv.conf</filename>, create a symlink:</para>
+
+<screen><userinput>ln -sv /run/systemd/network/resolv.conf /etc</userinput></screen>
+
+  </sect2>
+
+</sect1>
Index: BOOK/network/mips-chapter.xml
===================================================================
--- BOOK/network/mips-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/mips-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/mips64-64-chapter.xml
===================================================================
--- BOOK/network/mips64-64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/mips64-64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/mips64-chapter.xml
===================================================================
--- BOOK/network/mips64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/mips64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/multilib/dhcpcd.xml
===================================================================
--- BOOK/network/multilib/dhcpcd.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/multilib/dhcpcd.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -58,4 +58,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/dhcpcd.xml"
+  xpointer="xpointer(id('conf-dhcpcd'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/dhcpcd.xml"
   xpointer="xpointer(id('contents-dhcpcd'))"/>
 
Index: BOOK/network/ppc-chapter.xml
===================================================================
--- BOOK/network/ppc-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/ppc-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/ppc64-64-chapter.xml
===================================================================
--- BOOK/network/ppc64-64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/ppc64-64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/ppc64-chapter.xml
===================================================================
--- BOOK/network/ppc64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/ppc64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/sparc-chapter.xml
===================================================================
--- BOOK/network/sparc-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/sparc-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/sparc64-64-chapter.xml
===================================================================
--- BOOK/network/sparc64-64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/sparc64-64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/sparc64-chapter.xml
===================================================================
--- BOOK/network/sparc64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/sparc64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/x86-chapter.xml
===================================================================
--- BOOK/network/x86-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/x86-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/x86_64-64-chapter.xml
===================================================================
--- BOOK/network/x86_64-64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/x86_64-64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
Index: BOOK/network/x86_64-chapter.xml
===================================================================
--- BOOK/network/x86_64-chapter.xml	(revision 6d3523f84044f0edfdf888a800663df32b661efd)
+++ BOOK/network/x86_64-chapter.xml	(revision 31e77c043b8d3384be8312a5eeda5427f6a08161)
@@ -15,9 +15,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 
 </chapter>
