Index: general/sysutils/acpid.xml
===================================================================
--- general/sysutils/acpid.xml	(revision 22f9c48c029b96c1dc92c05ae81c7c1ec649eb48)
+++ general/sysutils/acpid.xml	(revision d5497a2e71d3c9b3ee9c7144584953448e6a891b)
@@ -145,11 +145,18 @@
 
     <sect3  id="acpid-init">
-      <title>Boot Script</title>
-
-      <para>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Socket</phrase></title>
+
+      <para revision="sysv">
         To automatically start <command>acpid</command> when the system is
         rebooted, install the <filename>/etc/rc.d/init.d/acpid</filename>
-        boot script from the <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
+        boot script from the <xref linkend="bootscripts"/> package.
+      </para>
+
+      <para revision="systemd">
+        To start the <command>acpid</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>
 
@@ -159,4 +166,12 @@
 
 <screen role="root"><userinput>make install-acpid</userinput></screen>
+
+      <note revision="systemd">
+        <para>
+          This package uses socket based activation and will be started when
+          something needs it. No standalone unit file is provided for this
+          package.
+        </para>
+      </note>
 
     </sect3>
Index: general/sysutils/at.xml
===================================================================
--- general/sysutils/at.xml	(revision 22f9c48c029b96c1dc92c05ae81c7c1ec649eb48)
+++ general/sysutils/at.xml	(revision d5497a2e71d3c9b3ee9c7144584953448e6a891b)
@@ -110,9 +110,16 @@
     commands:</para>
 
-    <screen><userinput>./configure --with-daemon_username=atd        \
+    <screen revision="sysv"><userinput>./configure --with-daemon_username=atd        \
             --with-daemon_groupname=atd       \
             SENDMAIL=/usr/sbin/sendmail       &amp;&amp;
 
 make</userinput></screen>
+
+    <screen revision="systemd"><userinput>./configure --with-daemon_username=atd        \
+            --with-daemon_groupname=atd       \
+            SENDMAIL=/usr/sbin/sendmail       \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
+
+make -j1</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -147,9 +154,16 @@
 
     <sect3  id="at-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/init.d/atd</filename> init script from
-      the <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
+
+      <para revision="sysv">Install the <filename>/etc/init.d/atd</filename>
+      init script from the <xref linkend="bootscripts"/> package.</para>
+
+      <para revision="systemd">
+        To start the <command>atd</command> daemon at boot,
+        enable the previously installed systemd unit by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
 
       <indexterm zone="at at-init">
@@ -157,5 +171,7 @@
       </indexterm>
 
-<screen role="root"><userinput>make install-atd</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make install-atd</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable atd</userinput></screen>
 
     </sect3>
Index: general/sysutils/autofs.xml
===================================================================
--- general/sysutils/autofs.xml	(revision 22f9c48c029b96c1dc92c05ae81c7c1ec649eb48)
+++ general/sysutils/autofs.xml	(revision d5497a2e71d3c9b3ee9c7144584953448e6a891b)
@@ -112,9 +112,15 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/         \
+<screen revision="sysv"><userinput>./configure --prefix=/         \
             --without-openldap \
             --mandir=/usr/share/man &amp;&amp;
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>./configure --prefix=/         \
+            --with-systemd     \            
+            --without-openldap \
+            --mandir=/usr/share/man &amp;&amp;
+make</userinput></screen>
+
     <para>This package does not come with a test suite.</para>
 
@@ -127,4 +133,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para revision="systemd">
+      <parameter>--with-systemd</parameter>: This switch enables installation
+      of the bundled systemd units.
+    </para>
 
     <para>
@@ -244,13 +255,20 @@
 
     <sect3  id="autofs-init">
-      <title>Boot Script</title>
-
-      <para> <application>autofs</application> installs its own boot script,
-      but it has no capability for logging or visual conformance with other
-      BLFS scripts.</para>
-
-      <para>Install the <filename>/etc/init.d/autofs</filename> mount script
-      included with the <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
+
+      <para revision="sysv"><application>autofs</application> installs its own
+      boot script, but it has no capability for logging or visual conformance
+      with other BLFS scripts.</para>
+
+      <para revision="sysv">Install the <filename>/etc/init.d/autofs</filename>
+      mount script included with the <xref linkend="bootscripts"/>
+      package.</para>
+
+      <para revision="systemd">
+        To start <application>Autofs</application> at boot, enable the
+        previously installed systemd unit by running the following command as
+        the <systemitem class="username">root</systemitem> user:
+      </para>
 
       <indexterm zone="autofs autofs-init">
@@ -258,11 +276,21 @@
       </indexterm>
 
-<screen role="root"><userinput>make install-autofs</userinput></screen>
-
-      <para>The time-out variable is set in
+<screen role="root" revision="sysv"><userinput>make install-autofs</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable autofs</userinput></screen>
+
+      <para revision="sysv">The time-out variable is set in
       <filename>/etc/sysconfig/autofs.conf</filename>. The installed file sets
       a default of 60 seconds of inactivity before unmounting the device.  A
       much shorter time may be necessary to protect buffer writing to a floppy
       if users tend to remove the media prior to the timeout setting.</para>
+
+      <note revision="systemd">
+        <para>
+          You can also specify <envar>OPTIONS</envar> variable in the
+          <filename>/etc/sysconfig/autofs</filename> file with any additional
+          parameters that you might want to pass to the automount daemon.
+        </para>
+      </note>
 
     </sect3>
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision 22f9c48c029b96c1dc92c05ae81c7c1ec649eb48)
+++ general/sysutils/bluez.xml	(revision d5497a2e71d3c9b3ee9c7144584953448e6a891b)
@@ -138,5 +138,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr         \
+<screen revision="sysv"><userinput>./configure --prefix=/usr         \
             --sysconfdir=/etc     \
             --localstatedir=/var  \
@@ -145,4 +145,10 @@
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --enable-library      &amp;&amp;
+make</userinput></screen>
+
     <para>
       To test the results, issue: <userinput>make check</userinput>.
@@ -184,5 +190,5 @@
     </para>
 
-    <para>
+    <para revision="sysv">
       <parameter>--disable-systemd</parameter>: This switch is needed because
       <application>systemd</application> is not part of LFS/BLFS. If you are
@@ -237,12 +243,19 @@
 
     <sect3  id="bluez-init">
-      <title>Boot Script</title>
-
-      <para>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Socket</phrase></title>
+
+      <para revision="sysv">
         To automatically start the <command>bluetoothd</command> daemon when the
         system is rebooted, install the
         <filename>/etc/rc.d/init.d/bluetooth</filename> bootscript from the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
+        <xref linkend="bootscripts"/> package.
+      </para>
+
+      <para revision="systemd">
+        To start the <command>bluetoothd</command> daemon at boot,
+        enable the previously installed systemd unit by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
       </para>
 
@@ -251,5 +264,14 @@
       </indexterm>
 
-<screen role="root"><userinput>make install-bluetooth</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make install-bluetooth</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable bluetooth</userinput></screen>
+
+      <note revision="systemd">
+        <para>
+          <application>Systemd</application> will start the Bluetooth daemon
+          only when a bluetooth device is detected on the system.
+        </para>
+      </note>
 
     </sect3>
