Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/cifsutils.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -99,7 +99,11 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen revision="sysv"><userinput>./configure --prefix=/usr \
             --disable-pam \
             --disable-systemd &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>./configure --prefix=/usr \
+            --disable-pam &amp;&amp;
 make</userinput></screen>
 
@@ -120,7 +124,8 @@
             PAM support.</para>
 
-          <para><parameter>--disable-systemd</parameter>: Disable systemd
-            specific behavior for <command>mount.cifs</command>. Remove it for
-            systems running with systemd.</para>
+          <para revision="sysv"><parameter>--disable-systemd</parameter>:
+            Disable systemd specific behavior for
+            <command>mount.cifs</command>. Remove it for systems running with
+            systemd.</para>
 
           <para><option>--with-pamdir=/lib/security</option>: Install the PAM
Index: networking/netprogs/netfs.xml
===================================================================
--- networking/netprogs/netfs.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/netfs.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -36,4 +36,3 @@
 <screen role='root'><userinput>make install-netfs</userinput></screen>
 
-  <para revision="systemd">TBA</para>
 </sect1>
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/nfs-utils.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -70,5 +70,7 @@
       <xref linkend="libevent"/>,
       <xref linkend="sqlite"/> and
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libnfsidmap</ulink> (for NFSv4 support),
+      <phrase revision="sysv"><ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libnfsidmap</ulink></phrase>
+      <phrase revision="systemd"><xref linkend="libnfsidmap"/></phrase>
+      (for NFSv4 support),
       <xref linkend="mitkrb"/> or
       <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>, and
@@ -218,21 +220,35 @@
 
       <sect4 id="nfs-utils-server-init">
-        <title>Boot Script</title>
-
-        <para>Install the <filename>/etc/rc.d/init.d/nfs-server</filename>
-        init script included in the <xref linkend="bootscripts" revision="sysv"/>
+        <title><phrase revision="sysv">Boot Script</phrase>
+               <phrase revision="systemd">Systemd Units</phrase></title>
+
+        <para>Install the
+        <phrase revision="sysv"><filename>/etc/rc.d/init.d/nfs-server</filename>
+        init script</phrase>
+        <phrase revision="systemd">NFSv4 server units</phrase>
+        included in the <xref linkend="bootscripts" revision="sysv"/>
         <xref linkend="systemd-units" revision="systemd"/> package
         to start the server at boot.</para>
 
+<screen role="root" revision="systemd"><userinput>make install-nfsv4-server</userinput></screen>
+
+        <para revision="systemd">
+          If you have disabled NFSv4 support, run the following command as the
+          <systemitem class="username">root</systemitem> user to omit the NFSv4
+          specific systemd units:
+        </para>
+
+<!-- both -->
 <screen role="root"><userinput>make install-nfs-server</userinput></screen>
 
-        <indexterm zone="nfs-utils nfs-utils-server-init">
+        <indexterm zone="nfs-utils nfs-utils-server-init" revision="sysv">
           <primary sortas="f-nfs-server">nfs-server</primary>
         </indexterm>
 
-        <para>Now create the <filename>/etc/sysconfig/nfs-server</filename>
-        configuration file:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"
+        <para revision="sysv">Now create the
+          <filename>/etc/sysconfig/nfs-server</filename> configuration file:
+        </para>
+
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"
 <literal>PORT="2049"
 PROCESSES="8"
@@ -241,11 +257,26 @@
 EOF</userinput></screen>
 
-        <note><para>The above parameters may be optionally placed in
-        <filename>/etc/sysconfig/rc.site</filename>.</para></note>
-
-        <indexterm zone="nfs-utils nfs-utils-server-init">
+        <note revision="sysv">
+          <para>The above parameters may be optionally placed in
+            <filename>/etc/sysconfig/rc.site</filename>.
+          </para>
+        </note>
+
+        <indexterm zone="nfs-utils nfs-utils-server-init" revision="sysv">
           <primary
           sortas="e-etc-sysconfig-nfs-server">/etc/sysconfig/nfs-server</primary>
         </indexterm>
+
+        <para revision="systemd">
+          You can edit the <filename>/etc/default/nfs-utils</filename>
+          file to change the startup options for NFS daemons. Defaults
+          should be fine for most use cases.
+        </para>
+
+        <indexterm zone="nfs-utils nfs-utils-server-init" revision="systemd">
+          <primary sortas="e-etc-default-nfs-utils">/etc/default/nfs-utils</primary>
+        </indexterm>
+
+
 
       </sect4>
@@ -287,11 +318,21 @@
 
       <sect4  id="nfs-utils-client-init">
-        <title>Boot Script</title>
-
-        <note><para>The following boot script is not required if the
-        nfs-server script is installed.</para></note>
-
-        <para>Install the <filename>/etc/rc.d/init.d/nfs-client</filename> init
-        script included in the <xref linkend="bootscripts" revision="sysv"/>
+        <title><phrase revision="sysv">Boot Script</phrase>
+               <phrase revision="systemd">Systemd Units</phrase></title>
+
+        <note>
+          <para>
+            The following <phrase revision="sysv">boot script is</phrase>
+            <phrase revision="systemd">systemd units are</phrase> not required
+            if the nfs-server <phrase revision="sysv">script is</phrase> 
+            <phrase revision="systemd">units are</phrase> installed.
+          </para>
+        </note>
+
+        <para>Install the
+        <phrase revision="sysv">
+        <filename>/etc/rc.d/init.d/nfs-client</filename> init script</phrase>
+        <phrase revision="systemd">units</phrase> included in the
+        <xref linkend="bootscripts" revision="sysv"/>
         <xref linkend="systemd-units" revision="systemd"/> package to start
         the client services at boot.</para>
@@ -308,5 +349,5 @@
         <xref linkend="postlfs-config-netfs"/>.</para>
 
-        <indexterm zone="nfs-utils nfs-utils-client-config">
+        <indexterm zone="nfs-utils nfs-utils-client-config" revision="sysv">
           <primary sortas="f-netfs">netfs</primary>
         </indexterm>
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/ntp.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -215,11 +215,17 @@
 
       <para>If you choose Option one, then install the
-      <filename>/etc/rc.d/init.d/ntp</filename>
-      init script included in the
+      <phrase revision="sysv"><filename>/etc/rc.d/init.d/ntp</filename>
+      init script</phrase>
+      <phrase revision="systemd"><filename>ntpd.service</filename> unit</phrase>
+      included in the
       <xref linkend="bootscripts" revision="sysv"/>
       <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
-      <indexterm zone="ntp ntp-init">
+      <indexterm zone="ntp ntp-init" revision="sysv">
         <primary sortas="f-ntp">ntp</primary>
+      </indexterm>
+
+      <indexterm zone="ntp ntp-init" revision="systemd">
+        <primary sortas="f-ntpd">ntpd.service</primary>
       </indexterm>
 
@@ -232,11 +238,13 @@
 <screen><literal>ntpd -q</literal></screen>
 
-      <para>Execute the following command if you would like to set the
-      hardware clock to the current system time at shutdown and reboot:</para>
-
-<screen role="root"><userinput>ln -v -sf ../init.d/setclock /etc/rc.d/rc0.d/K46setclock &amp;&amp;
+      <para revision="sysv">Execute the following command if you would like to
+      set the hardware clock to the current system time at shutdown and
+      reboot:</para>
+
+<screen role="root" revision="sysv"><userinput>ln -v -sf ../init.d/setclock /etc/rc.d/rc0.d/K46setclock &amp;&amp;
 ln -v -sf ../init.d/setclock /etc/rc.d/rc6.d/K46setclock</userinput></screen>
 
-      <para>The other way around is already set up by LFS.</para>
+      <para revision="sysv">The other way around is already set up by
+      LFS.</para>
 
     </sect3>
Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/rpcbind.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -83,4 +83,15 @@
     <title>Installation of rpcbind</title>
 
+    <para revision="systemd">
+      There should be a dedicated user and group to take control
+      of the <command>rpcbind</command> daemon after it is started.
+      Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root" revision="systemd"><userinput>groupadd -g 28 rpc &amp;&amp;
+useradd -c "RPC Bind Daemon Owner" -d /dev/null -g rpc \
+        -s /bin/false -u 28 rpc</userinput></screen>
+
     <!-- Packages should adapt to standards, not the other way around -->
     <para>In order to get <application>rpcbind</application> to work
@@ -102,7 +113,7 @@
 <screen revision="systemd"><userinput>patch -Np1 -i ../rpcbind-&rpcbind-version;-tirpc_fix-1.patch &amp;&amp;
 
-./configure --prefix=/usr       \
-            --bindir=/sbin      \
-            --with-rpcuser=root &amp;&amp;
+./configure --prefix=/usr  \
+            --bindir=/sbin \
+            --with-rpcuser=rpc &amp;&amp;
 make</userinput></screen>
 
@@ -118,10 +129,15 @@
     <title>Command Explanations</title>
 
-    <para><command>--with-rpcuser=root</command>: This works around an error in
-    the configure script.</para>
+    <para revision="sysv"><command>--with-rpcuser=root</command>: This works
+    around an error in the configure script.</para>
 
     <para revision="sysv"><command>--without-systemdsystemunitdir</command>:
     BLFS does not support systemd.</para>
 
+    <para revision="systemd"><parameter>--with-rpcuser=rpc</parameter>:
+    This switch is used so the <command>rpcbind</command> daemon will
+    run as an unprivileged user instead of the
+    <systemitem class="username">root</systemitem> user.</para>
+
   </sect2>
 
@@ -130,12 +146,21 @@
 
     <sect3 id="rpcbind-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/rc.d/init.d/rpcbind</filename> init
-      script included in the <xref linkend="bootscripts" revision="sysv"/>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
+
+      <para>Install the
+      <phrase revision="sysv"><filename>/etc/rc.d/init.d/rpcbind</filename>
+      init script</phrase>
+      <phrase revision="systemd"><filename>rpcbind.service</filename>
+      unit</phrase> included in the
+      <xref linkend="bootscripts" revision="sysv"/>
       <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
-      <indexterm zone="rpcbind rpcbind-init">
+      <indexterm zone="rpcbind rpcbind-init" revision="sysv">
          <primary sortas="f-rpcbind">rpcbind</primary>
+      </indexterm>
+
+      <indexterm zone="rpcbind rpcbind-init" revision="systemd">
+         <primary sortas="f-rpcbind">rpcbind.service</primary>
       </indexterm>
 
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/rsync.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -165,18 +165,49 @@
 
     <sect3 id="rsync-init">
-      <title>Boot Script</title>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
 
       <para>Note that you only want to start the
       <application>rsync</application> server if you want to provide an
       <application>rsync</application> archive on your local machine.
-      You don't need this script to run the
+      You don't need this <phrase revision="sysv">script</phrase>
+      <phrase revision="systemd">unit</phrase> to run the
       <application>rsync</application> client.</para>
 
-      <para>Install the <filename>/etc/rc.d/init.d/rsyncd</filename> init
-      script included in the
+      <para>Install the
+      <phrase revision="sysv"><filename>/etc/rc.d/init.d/rsyncd</filename> init
+      script</phrase>
+      <phrase revision="systemd"><filename>rsyncd.service</filename>
+      unit</phrase> included in the
       <xref linkend="bootscripts" revision="sysv"/>
       <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
 <screen role="root"><userinput>make install-rsyncd</userinput></screen>
+
+      <note revision="systemd">
+        <para>This package comes with two types of units: A service file and a
+        socket file. The service file will start rsync daemon once at boot
+        and it will keep running until the system shuts down. The socket file
+        will make systemd listen on rsync port (Default 873, needs to be
+        edited for anything else) and will start rsync daemon when something
+        tries to connect to that port and stop the daemon when the connection
+        is terminated. This is called socket activation and is analogous to
+        using <application>{,x}inetd</application> on a SysVinit based 
+        system.</para>
+
+
+        <para>By default, the first method is used - rsync daemon is started
+        at boot and stopped at shutdown. If the socket method is desired, you
+        need to run as the
+        <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>systemctl stop rsyncd &amp;&amp;
+systemctl disable rsyncd &amp;&amp;
+systemctl enable rsyncd.socket &amp;&amp;
+systemctl start rsyncd.socket</userinput></screen>
+
+        <para>Note that socket method is only useful for remote backups. For
+        local backups you'll need the service method.</para>
+      </note>
 
     </sect3>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/samba.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -121,5 +121,5 @@
     commands:</para>
 
-<screen><userinput>./configure                            \
+<screen revision="sysv"><userinput>./configure                            \
     --prefix=/usr                      \
     --sysconfdir=/etc                  \
@@ -130,4 +130,13 @@
     --without-ad-dc                    \
     --without-systemd                  &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>./configure                            \
+    --prefix=/usr                      \
+    --sysconfdir=/etc                  \
+    --localstatedir=/var               \
+    --with-piddir=/run/samba           \
+    --with-pammodulesdir=/lib/security \
+    --enable-fhs &amp;&amp;
 make</userinput></screen>
 
@@ -183,14 +192,14 @@
     a manner compliant with the Filesystem Hierarchy Standard (FHS).</para>
 
-    <para><parameter>--without-systemd</parameter>: Disable
+    <para revision="sysv"><parameter>--without-systemd</parameter>: Disable
     <application>systemd</application> integration, which is not part of
     LFS/BLFS. If you use <application>systemd</application>, replace by
     <parameter>--with-systemd</parameter>.</para>
 
-    <para><option>--without-ad-dc</option>: Disable Active Directory Domain
-    Controller functionality. See <ulink
+    <para revision="sysv"><option>--without-ad-dc</option>: Disable Active
+    Directory Domain Controller functionality. See <ulink
     url="https://wiki.samba.org/index.php/Setup_a_Samba_Active_Directory_Domain_Controller">
     Setup a Samba Active Directory Domain Controller</ulink> for detailed
-    information. </para>
+    information.</para>
 
     <para><option>--with-selftest-prefix=SELFTEST_PREFIX</option>: This option
@@ -203,5 +212,6 @@
     <para><command>ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so</command>
     and <command>ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so</command>:
-    These symlinks are required when applicates build against these libraries.</para>
+    These symlinks are required when applicationss build against these
+    libraries.</para>
 
     <para><command>install -v -m644 examples/LDAP/* /etc/openldap/schema</command>:
@@ -407,11 +417,10 @@
       </sect4>
 
-      <sect4 id="samba-init">
+      <sect4 id="samba-init" revision="sysv">
         <title>Boot Script</title>
 
         <para>For your convenience, boot scripts have been provided for
         <application>Samba</application>. There are two included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package. The first,
+        <xref linkend="bootscripts"/> package. The first,
         <filename>samba</filename>, will start the <command>smbd</command>
         and <command>nmbd</command> daemons needed to provide SMB/CIFS
@@ -453,5 +462,67 @@
 <screen role="root"><userinput>make install-winbindd</userinput></screen>
 
-       </sect4>
+      </sect4>
+
+      <sect4 id="samba-init-sysd" revision="systemd">
+        <title>Systemd Units</title>
+
+        <para>The default <application>Samba</application> installation uses the
+        <systemitem class='username'>nobody</systemitem> user for guest access
+        to the server. This can be overridden by setting the
+        <option>guest account =</option> parameter in the
+        <filename>/etc/samba/smb.conf</filename> file. If you utilize the
+        <option>guest account =</option> parameter, ensure this user exists in
+        the <filename>/etc/passwd</filename> file.</para>
+
+        <para>
+          To start the <application>Samba</application> daemons at boot,
+          install the systemd units from the <xref linkend="systemd-units"/>
+          package by running the following command as the
+          <systemitem class="username">root</systemitem> user:
+        </para>
+
+        <indexterm zone="samba samba-init-sysd">
+          <primary sortas="f-samba">samba</primary>
+        </indexterm>
+
+<screen role="root"><userinput>make install-samba</userinput></screen>
+
+        <para>
+          To start the <command>winbindd</command> daemon at boot,
+          install the systemd unit from the <xref linkend="systemd-units"/>
+          package by running the following command as the
+          <systemitem class="username">root</systemitem> user:
+        </para>
+
+        <indexterm zone="samba samba-init-sysd">
+          <primary sortas="f-winbindd">winbindd</primary>
+        </indexterm>
+
+<screen role="root"><userinput>make install-winbindd</userinput></screen>
+
+        <note>
+        <para>This package comes with two types of units: A service file and a
+        socket file. The service file will start the smbd daemon once at boot
+        and it will keep running until the system shuts down. The socket file
+        will make systemd listen on the smbd port (Default 445, needs to be
+        edited for anything else) and will start the smbd daemon when something
+        tries to connect to that port and stop the daemon when the connection
+        is terminated. This is called socket activation and is analogous to
+        using <application>{,x}inetd</application> on a SysVinit based
+        system.</para>
+
+        <para>By default, the first method is used - the smbd daemon is started
+        at boot and stopped at shutdown. If the socket method is desired, you
+        need to run the following commands as the
+        <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>systemctl stop smbd &amp;&amp;
+systemctl disable smbd &amp;&amp;
+systemctl enable smbd.socket &amp;&amp;
+systemctl start smbd.socket</userinput></screen>
+
+        <para>Note that only the smbd daemon can be socket activated.</para>
+        </note>
+      </sect4>
 
     </sect3>
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision a9e71e24caa97a3668ecba046ca179a100ea7735)
+++ networking/netprogs/wpa_supplicant.xml	(revision 7b478500038df36fb4b87a68943cf86296a8096f)
@@ -215,4 +215,12 @@
 install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8/</userinput></screen>
 
+    <para revision="systemd">
+      Install the <application>systemd</application> support files by
+      running the following command as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root" revision="systemd"><userinput>install -v -m644 systemd/*.service /lib/systemd/system/</userinput></screen>
+
     <para>
       If you have built <application>WPA Supplicant</application> with
@@ -228,4 +236,15 @@
                  /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>
 
+    <para revision="systemd">
+      Additionally, enable the <filename>wpa_supplicant.service</filename>
+      so that <application>systemd</application> can properly activate the
+      <application>D-Bus</application> service. Note that the 
+      per-connection service and the D-Bus service cannot be enabled 
+      at the same time. Run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable wpa_supplicant</userinput></screen>
+
     <para>
       If you have built the <application>WPA Supplicant</application> GUI
@@ -258,13 +277,22 @@
       <title>Config File</title>
 
-      <para>
+      <para revision="sysv">
         <filename>/etc/sysconfig/wpa_supplicant-*.conf</filename>
       </para>
 
-      <indexterm zone="wpa_supplicant wpa_supplicant-config">
+      <para revision="systemd">
+        <filename>/etc/wpa_supplicant/wpa_supplicant-*.conf</filename>
+      </para>
+
+      <indexterm zone="wpa_supplicant wpa_supplicant-config" revision="sysv">
         <primary
         sortas="e-etc-sysconfig-wpa_supplicant-star.conf">/etc/sysconfig/wpa_supplicant-*.conf</primary>
       </indexterm>
 
+      <indexterm zone="wpa_supplicant wpa_supplicant-config" revision="systemd">
+        <primary
+        sortas="e-etc-wpa_supplicant-wpa_supplicant-star.conf">/etc/wpa_supplicant/wpa_supplicant-*.conf</primary>
+      </indexterm>
+
     </sect3>
 
@@ -274,6 +302,9 @@
       <para>
         To connect to an access point that uses a password, you need to put
-        the pre-shared key in <filename>
-        /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
+        the pre-shared key in
+        <phrase revision="sysv"><filename>
+        /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.</phrase>
+        <phrase revision="systemd"><filename>
+        /etc/wpa_supplicant/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.</phrase>
         SSID is the string that the access point/router transmits to
         identify itself. Run the following command as the
@@ -281,9 +312,13 @@
       </para>
 
-<screen role="root"><userinput>wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
+<screen role="root" revision="sysv"><userinput>wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>install -v -dm755 /etc/wpa_supplicant &amp;&amp;
+wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/wpa_supplicant/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
 
       <para>
-        <filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf
-        </filename> can hold the details of several access points. When
+        <phrase revision="sysv"><filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf </filename></phrase>
+        <phrase revision="systemd"><filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename></phrase> 
+        can hold the details of several access points. When
         <command>wpa_supplicant</command> is started, it will scan for the
         SSIDs it can see and choose the appropriate password to connect.
@@ -292,6 +327,7 @@
       <para>
         If you want to connect to an access point that isn't password
-        protected, put an entry like this in <filename>
-        /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
+        protected, put an entry like this in
+        <phrase revision="sysv"><filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename></phrase>
+        <phrase revision="systemd"><filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename></phrase>.
         Replace "Some-SSID" with the SSID of the access point/router.
       </para>
@@ -314,19 +350,18 @@
       <title>Connecting to an Access Point</title>
 
-      <para id="wpa-service">
+      <para id="wpa-service" revision="sysv">
         If you want to configure network interfaces at boot using
         <command>wpa_supplicant</command>, you need to install the
         <filename>/lib/services/wpa</filename> script
-        included in <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-<screen role="root"><userinput>make install-service-wpa</userinput></screen>
-
-      <indexterm zone="wpa_supplicant wpa-service">
+        included in <xref linkend="bootscripts"/> package:
+      </para>
+
+<screen role="root" revision="sysv"><userinput>make install-service-wpa</userinput></screen>
+
+      <indexterm zone="wpa_supplicant wpa-service" revision="sysv">
         <primary sortas="f-wpa">wpa</primary>
       </indexterm>
 
-      <para>
+      <para revision="sysv">
         If your router/access point uses DHCP to allocate IP addresses, you
         can install <xref linkend="dhcp"/> client and use it to
@@ -337,5 +372,5 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
 IFACE="<replaceable>wlan0</replaceable>"
@@ -358,5 +393,5 @@
 EOF</userinput></screen>
 
-      <para>
+      <para revision="sysv">
         If you prefer <xref linkend="dhcpcd"/> instead of
         <xref linkend="dhcp"/> client, then create the
@@ -366,5 +401,5 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
 IFACE="<replaceable>wlan0</replaceable>"
@@ -379,5 +414,5 @@
 EOF</userinput></screen>
 
-      <para>
+      <para revision="sysv">
         Alternatively, if you use static addresses on your local network,
         then create the
@@ -387,5 +422,5 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
 IFACE="<replaceable>wlan0</replaceable>"
@@ -402,4 +437,34 @@
 EOF</userinput></screen>
 
+      <para revision="systemd">
+        There are 3 types of <application>systemd</application> units
+        that were installed:
+      </para>
+
+      <itemizedlist spacing="compact" revision="systemd">
+        <listitem>
+          <para>
+            wpa_supplicant@.service
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            wpa_supplicant-nl80211@.service
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            wpa_supplicant-wired@.service
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para revision="systemd">
+        The only difference between 3 of them is what driver
+        is used for connecting (-D option). The first one uses
+        the default driver, the second one uses the nl80211
+        driver and the third one uses the wired driver.
+      </para>
+
       <para>
         You can connect to the wireless access point by
@@ -408,7 +473,7 @@
       </para>
 
-<screen role="root"><userinput>ifup <replaceable>wifi0</replaceable></userinput></screen>
-
-      <para>
+<screen role="root" revision="sysv"><userinput>ifup <replaceable>wifi0</replaceable></userinput></screen>
+
+      <para revision="sysv">
         Replace <replaceable>wlan0</replaceable> with the correct
         wireless interface and <replaceable>wifi0</replaceable>
@@ -418,4 +483,28 @@
         to have identical names, ie both contain
         <replaceable>wifi0</replaceable> in their name.
+      </para>
+
+<screen role="root" revision="systemd"><userinput>systemctl start wpa_supplicant@<replaceable>wlan0</replaceable></userinput></screen>
+
+      <para revision="systemd">
+        To connect to the wireless access point at
+        boot, simply enable the appropriate
+        <command>wpa_supplicant</command> service
+        by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable wpa_supplicant@<replaceable>wlan0</replaceable></userinput></screen>
+
+      <para revision="systemd">
+        Depending on your setup, you can replace the
+        <filename>wpa_supplicant@.service</filename>
+        with any other listed above.
+      </para>
+
+      <para revision="systemd">
+        To assign a network address to your wireless interface, consult the
+        <ulink url="&lfs-root;/chapter07/network.html">General Network Configuration</ulink>
+        page in LFS.
       </para>
 
