Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ introduction/welcome/changelog.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -44,4 +44,35 @@
 
 -->
+
+    <listitem>
+      <para>July 15th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[cjg] - Converted ntp page to systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[cjg] - Converted rcpbind page to systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[cjg] - Converted rsync page to systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[cjg] - Converted samba page to systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[cjg] - Converted wpa_supplicant page to systemd.</para>
+        </listitem>
+          <listitem>
+          <para>[cjg] - Converted avahi page to systemd.</para>
+        </listitem>
+         <listitem>
+          <para>[cjg] - Converted networkmanager page to systemd.</para>
+        </listitem>
+         <listitem>
+          <para>[cjg] - Converted wicd page to systemd.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 14th, 2014</para>
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netprogs/ntp.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -173,5 +173,5 @@
     </sect3>
 
-    <sect3  id="ntp-init">
+    <sect3  id="ntp-init-systemd">
       <title>Synchronizing the Time</title>
 
@@ -182,9 +182,9 @@
 
       <para>If you choose Option one, then install the
-      <filename>/etc/rc.d/init.d/ntp</filename>
-      init script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="ntp ntp-init">
+        native systemd unit included in the
+      <xref linkend="systemd-units"/> package as the <systemitem class="username">root</systemitem> 
+       user:</para>
+
+      <indexterm zone="ntp ntp-init-systemd">
         <primary sortas="f-ntp">ntp</primary>
       </indexterm>
Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netprogs/rpcbind.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -106,11 +106,13 @@
     <title>Configuring rpcbind</title>
 
-    <sect3 id="rpcbind-init">
-      <title>Boot Script</title>
+    <sect3 id="rpcbind-init-systemd">
+      <title>Systemd Unit File</title>
 
-      <para>Install the <filename>/etc/rc.d/init.d/rpcbind</filename> init script
-      included in the <xref linkend="bootscripts"/> package.</para>
+      <para>The systemd-units package provides a native systemd unit file.
+        To install and activate the systemd unit file included in the 
+      <xref linkend="systemd-units"/> package run the following command as the
+      <systemitem class="username">root</systemitem> user:</para>
 
-      <indexterm zone="rpcbind rpcbind-init">
+      <indexterm zone="rpcbind rpcbind-init-systemd">
          <primary sortas="f-rpcbind">rpcbind</primary>
       </indexterm>
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netprogs/rsync.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -164,6 +164,6 @@
     </sect3>
 
-    <sect3 id="rsync-init">
-      <title>Boot Script</title>
+    <sect3 id="rsync-init-systemd">
+      <title>Systemd Unit File</title>
 
       <para>Note that you only want to start the
@@ -171,11 +171,44 @@
       <application>rsync</application> archive on your local machine.
       You don't need this script to run the
-      <application>rsync</application> client.</para>
-
-      <para>Install the <filename>/etc/rc.d/init.d/rsyncd</filename> init
-      script included in the
-      <xref linkend="bootscripts"/> package.</para>
+      <application>rsync</application> client.
+      The systemd-units package provides two types of units: A service file and 
+      a socket file. The service file will start rsyncd daemon once at boot 
+      and it will keep running until the system shuts down. The socket 
+      file will make systemd listen to sshd port (Default 873) and will start rsyncd daemon 
+      when something tries to connect to that port and stop the daemon when the connection is terminated. 
+      This is called socket activation.
+      By default, the first method is used - rsyncd daemon is started at boot and stopped at shutdown.
+      </para>
+
+      <para>To install the systemd unit file init included in the
+      <xref linkend="systemd-units"/> package run the following command
+       as the <systemitem class="username">root</systemitem> 
+       user:
+      </para>
 
 <screen role="root"><userinput>make install-rsyncd</userinput></screen>
+
+      <note>
+      <para>
+       Note that socket method is only useful for remote backups. For local backups you'll need  
+       the service method.
+      </para>
+      </note>
+
+      <para>
+       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 rsyncd &amp;&amp; 
+systemctl disable rsyncd.service &amp;&amp; 
+systemctl enable rsyncd.socket &amp;&amp;
+systemctl start rsync.socket
+
+</userinput></screen>
 
     </sect3>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netprogs/samba.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -397,21 +397,23 @@
       </sect4>
 
-      <sect4 id="samba-init">
-        <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"/> package. The first,
-        <filename>samba</filename>, will start the <command>smbd</command>
-        and <command>nmbd</command> daemons needed to provide SMB/CIFS
-        services. The second script, <filename>winbind</filename>, starts
-        the <command>winbindd</command> daemon, used for providing Windows
-        domain services to Linux clients.</para>
-
-        <indexterm zone="samba samba-init">
+      <sect4 id="samba-init-systemd">
+        <title>Systemd Unit File</title>
+
+        <para>The <xref linkend="systemd-units"/> package provides types of units: 
+         A service file and a socket file. 
+         The service file will start smbd daemon once at boot and it 
+         will keep running until the system shuts down. The socket 
+         file will make systemd listen to sshd port (Default 445) and 
+         will start smbd daemon when something tries to connect to that 
+         port and stop the daemon when the connection is terminated. 
+         This is called socket activation. By default, the first method 
+         is used - smbd daemon is started at boot and stopped at shutdown.
+        </para>
+
+        <indexterm zone="samba samba-init-systemd">
           <primary sortas="f-samba">samba</primary>
         </indexterm>
 
-        <indexterm zone="samba samba-init">
+        <indexterm zone="samba samba-init-systemd">
           <primary sortas="f-winbind">winbind</primary>
         </indexterm>
@@ -431,5 +433,5 @@
     -s /bin/false -u 99 nobody</userinput></screen>
 
-        <para>Install the <filename>samba</filename> script with the following
+        <para>Install the <filename>samba</filename> systemd unit file with the following
         command issued as the <systemitem class="username">root</systemitem>
         user:</para>
@@ -441,4 +443,33 @@
 
 <screen role="root"><userinput>make install-winbindd</userinput></screen>
+
+         <note>
+         <para>
+           Note that nmbd and winbindd do not have (and should/can not have) 
+           units for socket based activation.
+         </para>
+         </note>
+
+        <para>If the socket method is desired, you need to run
+         the following command issues as the <systemitem class="username">root</systemitem>
+         user:
+        </para>
+
+<screen role="root">
+<userinput>
+
+systemctl stop smbd &amp;&amp;
+systemctl disable smbd.service &amp;&amp;
+systemctl enable smbd.socket &amp;&amp;
+systemctl start smbd.socket
+
+</userinput></screen> 
+
+         <note>
+         <para>
+           Note that nmbd and winbindd do not have (and should/can not have) 
+           units for socket based activation.
+         </para>
+         </note>
 
        </sect4>
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netprogs/wpa_supplicant.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -312,11 +312,46 @@
 
       <para id="wpa-service">
-        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"/> package:
-      </para>
-
-<screen role="root"><userinput>make install-service-wpa</userinput></screen>
+        This package provides systemd units in the source tarball. 
+        To install them, issue the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root">
+<userinput>
+install -v -m644 systemd/*.service /lib/systemd/system
+</userinput></screen>
+ 
+      <para>
+        The following files were installed:
+
+        /lib/systemd/system/wpa_supplicant.service
+
+        /lib/systemd/system/wpa_supplicant-nl80211@.service
+        /lib/systemd/system/wpa_supplicant-wired@.service
+        /lib/systemd/system/wpa_supplicant@.service
+
+        The first service should be enabled if D-Bus interface was built into 
+        wpa_supplicant, so that wpa_supplicant D-Bus interface can be started at boot 
+        instead of being automatically activated by the D-Bus daemon which doesn't work 
+        when using systemd.
+        To enable the service issue the following command as the
+        <systemitem class="username">root</systemitem> user:
+       </para>
+
+<screen role="root">
+<userinput>
+systemctl enable wpa_supplicant.service
+</userinput></screen>
+
+       <para>
+         The following three files are per-interface specific files. 
+         Much like LFS ifupdown@.service, they will start wpa_supplicant for a network 
+         interface. Only difference between the three files is the wpa_supplicant_driver 
+         being used.
+
+         The first one uses -Dnl80211, the second one uses -Dwired and the last one uses 
+         default -D option (not specified).
+       </para>
+
 
       <indexterm zone="wpa_supplicant wpa-service">
@@ -327,11 +362,18 @@
         If your router/access point uses DHCP to allocate IP addresses, you
         can install <xref linkend="dhcp"/> client and use it to
-        automatically obtain network addresses. Create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
+        automatically obtain network addresses. If your using the first unit file
+        Create the
+        <filename>/etc/wpa_supplicant/wpa_supplicant-nl80211-<replaceable>wifi0</replaceable>.conf
         </filename> by running the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
+      <note>
+      <para>
+        wifi0 needs to be replaced with the actual interface.
+      </para>
+      </note>
+
+<screen role="root"><userinput>cat &gt; /etc/wpa_supplicant/wpa_supplicant-nl80211-<replaceable>wifi0</replaceable>.conf &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
 IFACE="<replaceable>wlan0</replaceable>"
@@ -354,15 +396,120 @@
 EOF</userinput></screen>
 
+      <note>
+      <para>
+        Note that the argument after @ and the interface name,
+        ie wifi0 must be the same.
+      </para>
+      </note>
+
+      <para>
+        To enable it, issue the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+<screen role="root"><userinput>
+systemctl enable wpa_supplicant-nl80211@wifi0
+</userinput></screen>
+
+      <para>
+        If your using the second unit file
+        Create the
+        <filename>/etc/wpa_supplicant/wpa_supplicant-wired-<replaceable>eth0</replaceable>.conf
+        </filename> by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/wpa_supplicant/wpa_supplicant-wired-<replaceable>eth0</replaceable>.conf &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+IFACE="<replaceable>eth0</replaceable>"
+SERVICE="wpa"
+
+# Additional arguments to wpa_supplicant
+WPA_ARGS=""
+
+WPA_SERVICE="dhclient"
+DHCP_START=""
+DHCP_STOP=""
+
+# Set PRINTIP="yes" to have the script print
+# the DHCP assigned IP address
+PRINTIP="no"
+
+# Set PRINTALL="yes" to print the DHCP assigned values for
+# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
+PRINTALL="no"</literal>
+EOF</userinput></screen>
+
+      <note>
+      <para>
+        Note that the argument after @ and the interface name,
+        ie eth0 must be the same.
+      </para>
+      </note>
+
+      <para>
+        To enable it, issue the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>
+systemctl enable wpa_supplicant-wired@eth0
+</userinput></screen>
+
+      <para>
+        If your using the third unit file
+        Create the
+        <filename>/etc/wpa_supplicant/wpa_supplicant-<replaceable>eth0</replaceable>.conf
+        </filename> by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/wpa_supplicant/wpa_supplicant-<replaceable>eth0</replaceable>.conf &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+IFACE="<replaceable>eth0</replaceable>"
+SERVICE="wpa"
+
+# Additional arguments to wpa_supplicant
+WPA_ARGS=""
+
+WPA_SERVICE="dhclient"
+DHCP_START=""
+DHCP_STOP=""
+
+# Set PRINTIP="yes" to have the script print
+# the DHCP assigned IP address
+PRINTIP="no"
+
+# Set PRINTALL="yes" to print the DHCP assigned values for
+# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
+PRINTALL="no"</literal>
+EOF</userinput></screen>
+
+      <note>
+      <para>
+        Note that the argument after @ and the interface name,
+        ie eth0 must be the same.
+      </para>
+      </note>
+
+      <para>
+        To enable it, issue the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>
+systemctl enable wpa_supplicant-@eth0
+</userinput></screen>
+
       <para>
         If you prefer <xref linkend="dhcpcd"/> instead of
         <xref linkend="dhcp"/> client, then create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
+        <filename>/etc/wpa_supplicant/wpa_supplicant-nl80211-<replaceable>wifi0</replaceable>.conf
         </filename> by running the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt; /etc/wpa_supplicant/wpa_supplicant-nl80211-<replaceable>wifi0</replaceable>.conf &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
+IFACE="<replaceable>wifi0</replaceable>"
 SERVICE="wpa"
 
@@ -378,12 +525,12 @@
         Alternatively, if you use static addresses on your local network,
         then create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
+        <filename>/etc/wpa_supplicant/wpa_supplicant-nl80211-<replaceable>wifi0</replaceable>.conf
         </filename> by running the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt; /etc/wpa_supplicant/wpa_supplicant-nl80211-<replaceable>wifi0</replaceable>.conf &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
+IFACE="<replaceable>wifi0</replaceable>"
 SERVICE="wpa"
 
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netutils/avahi.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -242,19 +242,26 @@
     <title>Configuring avahi</title>
 
-    <sect3  id="avahi-init">
-      <title>Boot Script</title>
+    <sect3  id="avahi-init-systemd">
+      <title>Systemd Unit File</title>
 
       <para>
-        To automatically start the <command>avahi-daemon</command>
-        when the system is rebooted, install the
-        <filename>/etc/rc.d/init.d/avahi</filename> bootscript from
-        the <xref linkend="bootscripts"/> package.
+        This package will automatically install systemd units 
+        if systemd is detected. To enable them, issue the following
+        commands as the <systemitem class="username">root</systemitem> 
+        user:
       </para>
 
-      <indexterm zone="avahi avahi-init">
+      <indexterm zone="avahi avahi-init-systemd">
         <primary sortas="f-avahi">avahi</primary>
       </indexterm>
 
-<screen role="root"><userinput>make install-avahi</userinput></screen>
+<screen role="root"><userinput>systemctl enable avahi-daemon</userinput></screen>
+
+      <para>
+        If desired issue the following command as the <systemitem class="username">root</systemitem> 
+        user:
+      </para>
+ 
+<screen role="root"><userinput>systemctl enable avahi-dnsconfd</userinput></screen>
 
     </sect3>
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netutils/networkmanager.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -133,5 +133,6 @@
             --with-nmtui         \
             --disable-ppp        \
-            --with-systemdsystemunitdir=no &amp;&amp;
+            --with-session-tracking=systemd \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
 make</userinput></screen>
 
@@ -158,7 +159,11 @@
 
     <para>
-      <parameter>--with-systemdsystemunitdir=no</parameter>: This parameter is
-      used for sysv init systems. If you use systemd, replace "no" by the
-      proper directory.
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>: This parameter is
+      used to specifiy the correct location for the systemd unit files.
+    </para>
+
+    <para>
+      <parameter>--with-session-tracking=systemd</parameter>: This parameter
+       enables the use of systemd-logind for session tracking. 
     </para>
 
@@ -223,19 +228,24 @@
     </sect3>
 
-    <sect3 id="NetworkManager-init">
-      <title>Boot Script</title>
+    <sect3 id="NetworkManager-init-systemd">
+      <title>Systemd Unit File</title>
 
       <para>
-        To automatically start the <command>NetworkManager</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/networkmanager</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
+        This package will automatically install systemd units if systemd is detected.
+        To enable the NetworkManager daemon, issue the following command as the 
+        <systemitem class="username">root</systemitem> user: 
       </para>
 
-      <indexterm zone="NetworkManager NetworkManager-init">
+      <indexterm zone="NetworkManager NetworkManager-init-systemd">
         <primary sortas="f-NetworkManager">NetworkManager</primary>
       </indexterm>
 
-<screen role="root"><userinput>make install-networkmanager</userinput></screen>
+<screen role="root"><userinput>systemctl enable NetworkManager</userinput></screen>
+
+      <para>
+        The other systemd unit that this package provides is NetworkManager-wait-online.service 
+        which can be used to block programs that require connectivity (depending on the systemd network.target) 
+        from starting untill the network interfaces have been configured.
+      </para>
 
     </sect3>
Index: networking/netutils/wicd.xml
===================================================================
--- networking/netutils/wicd.xml	(revision cae7a6fb50454e6992b69ba1954080ee3c4cf913)
+++ networking/netutils/wicd.xml	(revision 5bc57bba05e791f92fda2fb18347a713f8c79bc6)
@@ -115,5 +115,5 @@
     commands:</para>
 
-<screen><userinput>sed -i '/wpath.logrotate\|wpath.systemd/d' setup.py &amp;&amp;
+<screen><userinput>sed -i '/wpath.logrotate/d' setup.py &amp;&amp;
 rm po/*.po                                          &amp;&amp;
 python setup.py configure --no-install-kde     \
@@ -139,6 +139,6 @@
 
     <para><command>sed -i '/wpath...</command>: This <command>sed</command>
-    prevents installation of <command>logrotate</command> and systemd
-    configuration files. You may omit it if you use these utilities.</para>
+    prevents installation of <command>logrotate</command>
+    configuration files. You may omit it if you use this utility.</para>
 
     <para><option>--no-install-kde</option>: Prevent installation of an
@@ -152,5 +152,5 @@
 
     <para><option>--no-install-pmutils</option>: Prevent installation of hooks for
-    pm-utils. Omit this option if you use pm-utils.</para>
+    pm-utils.</para>
 
     <para><option>--no-install-init</option>: Prevent installation of any init scripts,
@@ -174,25 +174,16 @@
     </sect3>
 
-    <sect3 id="wicd-init">
+    <sect3 id="wicd-init-systemd">
       <title>Configuration Information</title>
 
-      <para>To automatically start Wicd at boot time, you need to first install
-      the Wicd bootscript,
-      <filename>/etc/rc.d/init.d/wicd</filename>,
-      included in the <xref linkend="bootscripts"/> package
+      <para>This package ships a systemd unit in the tarball. To enable it
+       issue the following command
       (as user <systemitem class="username">root</systemitem>):</para>
 
-      <indexterm zone="wicd wicd-init">
-        <primary sortas="f-wicd">wicd (bootscript)</primary>
+      <indexterm zone="wicd wicd-init-systemd">
+        <primary sortas="f-wicd">wicd (systemd unit file)</primary>
       </indexterm>
 
-      <screen role='root'><userinput>make install-wicd</userinput></screen>
-
-      <para>Since Wicd will now handle all configuration of network devices,
-      the network bootscript installed by LFS should be disabled. This can be
-      achieved by either removing any <filename>S*network</filename> and
-      <filename>K*network</filename> symlinks in the <filename>/etc/rc*.d</filename>
-      directories or by setting <literal>ONBOOT=no</literal> in any
-      <filename>/etc/sysconfig/ifconfig.*</filename> files.</para>
+      <screen role='root'><userinput>systemctl enable wicd</userinput></screen>
 
       <para>No manual configuration of Wicd is needed if you use the graphical
