Index: general.ent
===================================================================
--- general.ent	(revision af8b2d902874a0798738669432f316723ecbf37a)
+++ general.ent	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
@@ -1,11 +1,11 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 31st, &year;">
+<!ENTITY releasedate  "June 2nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
@@ -77,6 +77,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20150310">
-<!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-systemd-units-&blfs-bootscripts-version;.tar.bz2">
+<!ENTITY systemd-units-version        "20160602">
 
 <!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision af8b2d902874a0798738669432f316723ecbf37a)
+++ general/sysutils/systemd.xml	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
@@ -5,8 +5,14 @@
   %general-entities;
 
-  <!ENTITY systemd-download-http       "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&lfs-systemd-version;.tar.xz">
+  <!ENTITY systemd-download-http "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&systemd-version;.tar.xz">
+  <!ENTITY systemd-download-ftp  " ">
+  <!ENTITY systemd-md5sum        "7fd9c7b1296104ccc0b8aee4be3d3c23">
+  <!ENTITY systemd-size          "3,748 KB">
+  <!ENTITY systemd-buildsize     "1.0 GB">
+  <!ENTITY systemd-time          "4.9 SBU">
+
 ]>
 
-<sect1 id="systemd" xreflabel="Systemd-&lfs-systemd-version;">
+<sect1 id="systemd" xreflabel="Systemd-&systemd-version;" revision="systemd">
   <?dbhtml filename="systemd.html"?>
 
@@ -16,5 +22,5 @@
   </sect1info>
 
-  <title>Systemd-&lfs-systemd-version;</title>
+  <title>Systemd-&systemd-version;</title>
 
   <indexterm zone="systemd">
@@ -26,10 +32,11 @@
 
     <para>
-      Even though <application>systemd</application> was installed while
+      While <application>systemd</application> was installed when
       building LFS, there are many features provided by the package that
-      were not included in the initial installation due to unmet dependencies.
+      were not included in the initial installation becasue
+      <application>Linux-PAM</application> was not yet installed.
       The <application>systemd</application> package needs to be
       rebuilt to provide a working <command>systemd-logind</command> service,
-      among many others.
+      which provides many additonal features for dependent packages.
     </para>
     
@@ -39,5 +46,20 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Systemd Download (HTTP): <ulink url="&systemd-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&systemd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&systemd-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &systemd-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &systemd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &systemd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &systemd-time;</para>
       </listitem>
     </itemizedlist>
@@ -84,5 +106,6 @@
       <para>
         In order to build the <application>systemd</application>
-        <application>Python</application> module, lxml package
+        <application>Python</application> module, the
+        <application>lxml</application> package
         needs to be installed for the corresponding
         <application>Python</application> version (2 or 3).
@@ -143,5 +166,5 @@
             --without-python         \
             --with-default-dnssec=no \
-            --docdir=/usr/share/doc/systemd-&lfs-systemd-version; &amp;&amp;
+            --docdir=/usr/share/doc/systemd-&systemd-version; &amp;&amp;
 make</userinput></screen>
 
@@ -160,12 +183,12 @@
     <warning>
       <para>
-        Installing the package will override all files installed by
+        Installing the package will overwrite all files installed by
         <application>systemd</application> in LFS. It is critical that
         nothing uses either <application>systemd</application> or
-        <application>Udev</application> libraries or programs during
-        the installation phrase. Best way to achieve that is to do the
-        installation in the rescue mode. To switch to the rescue mode,
-        issue the following command as the
-        <systemitem class="username">root</systemitem> user from a TTY:
+        <application>Udev</application> libraries during the installation.
+        The best way to ensure that these libraries are not being used is to
+        run the installation in rescue mode. To switch to rescue mode,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user (from a TTY):
       </para>
 
@@ -202,7 +225,6 @@
       The <filename>/etc/pam.d/system-sesion</filename> file needs to
       be modified and a new file needs to be created in order for
-      <command>systemd-logind</command> to work correctly. To accomplish
-      that, run the following commands as the <systemitem
-     class="username">root</systemitem> user:
+      <command>systemd-logind</command> to work correctly. Run the following
+      commands as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -234,6 +256,6 @@
     <para>
       At this point, you should reload the systemd daemon, and reenter
-      multi-user mode with the following commands as the
-      <systemitem class="username">root</systemitem> user:
+      multi-user mode with the following commands (as the
+      <systemitem class="username">root</systemitem> user):
     </para>
 
@@ -241,7 +263,7 @@
 systemctl start multi-user.target</userinput></screen>
 
-    <warning><para>If upgrading from a previous version of systemd and you
-    use an initrd, the system will hang during boot if you do not generate a
-    new initrd with systemd-root-device.target included.</para></warning>
+    <warning><para>If upgrading from a previous version of systemd and an
+    initrd is used for system boot, you should generate a new initrd before
+    rebooting the system.</para></warning>
 
   </sect2>
@@ -257,5 +279,5 @@
 
       <para>
-        Below are listed newly installed libraries and directories
+        Listed below are the newly installed libraries and directories
         along with short descriptions.
       </para>
Index: troduction/important/bootscripts-systemd.xml
===================================================================
--- introduction/important/bootscripts-systemd.xml	(revision af8b2d902874a0798738669432f316723ecbf37a)
+++ 	(revision )
@@ -1,59 +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="bootscripts" xreflabel="blfs-systemd-units-&blfs-bootscripts-version;">
-  <?dbhtml filename="systemd-units.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>BLFS Systemd Units</title>
-
-  <indexterm zone="bootscripts">
-    <primary sortas="a-BLFS-Sytemd-Units">BLFS Systemd Units</primary>
-  </indexterm>
-
-  <indexterm zone="bootscripts">
-    <primary sortas="f-AA-General-Information">General Information</primary>
-  </indexterm>
-
-  <para>
-    The BLFS Systemd Units package contains the systemd unit files
-    that are used throughout the book.
-  </para>
-
-  <itemizedlist spacing="compact">
-    <title>Package Information</title>
-    <listitem>
-      <para>
-        Download: <ulink url="&blfs-bootscripts-download;"/>
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <para>
-    The BLFS Systemd Units package will be used throughout the BLFS book
-    for systemd unit files. Each systemd unit has a separate install target.
-    It is recommended you keep the package source directory around until
-    completion of your BLFS system. When a systemd unit is requested from BLFS
-    Systemd Units, simply change to the directory and as the
-    <systemitem class="username">root</systemitem> user, execute the given
-    <command>make install-<replaceable>&lt;systemd-unit&gt;</replaceable></command>
-    command. This command installs the systemd unit to its proper location (along
-    with any auxiliary configuration scripts) and also enables it by default.
-  </para>
-
-  <note>
-    <para>
-      It is advisable to peruse each systemd unit before installation to
-      ascertain that it satisfies your need.
-    </para>
-  </note>
-
-</sect1>
Index: introduction/important/important.xml
===================================================================
--- introduction/important/important.xml	(revision af8b2d902874a0798738669432f316723ecbf37a)
+++ introduction/important/important.xml	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
@@ -26,5 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="position.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-units.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraries.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale-issues.xml"/>
Index: introduction/important/systemd-units.xml
===================================================================
--- introduction/important/systemd-units.xml	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
+++ introduction/important/systemd-units.xml	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
@@ -0,0 +1,60 @@
+<?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="bootscripts" xreflabel="blfs-systemd-units-&systemd-units-version;" revision="systemd">
+  <?dbhtml filename="systemd-units.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>BLFS Systemd Units</title>
+
+  <indexterm zone="bootscripts">
+    <primary sortas="a-BLFS-Sytemd-Units">BLFS Systemd Units</primary>
+  </indexterm>
+
+  <indexterm zone="bootscripts">
+    <primary sortas="f-AA-General-Information">General Information</primary>
+  </indexterm>
+
+  <para>
+    The BLFS Systemd Units package contains the systemd unit files
+    that are used throughout the book.
+  </para>
+
+  <itemizedlist spacing="compact">
+    <title>Package Information</title>
+    <listitem>
+      <para>
+        Download: <ulink url="&downloads-root;/blfs-systemd-units-&systemd-units-version;.tar.xz"/>
+      </para>
+    </listitem>
+  </itemizedlist>
+
+  <para>
+    The BLFS Systemd Units package will be used throughout the BLFS book
+    for systemd unit files. Each systemd unit has a separate install target.
+    It is recommended that you keep the package source directory around until
+    completion of your BLFS system. When a systemd unit is requested from BLFS
+    Systemd Units, simply change to the directory, and as the
+    <systemitem class="username">root</systemitem> user, execute the given
+    <command>make install-<replaceable>&lt;systemd-unit&gt;</replaceable></command>
+    command. This command installs the systemd unit to its proper location
+    (along with any auxiliary configuration scripts) and also enables it by
+    default.
+  </para>
+
+  <note>
+    <para>
+      It is advisable to peruse each systemd unit before installation to
+      determine whether the installed files meet your needs.
+    </para>
+  </note>
+
+</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision af8b2d902874a0798738669432f316723ecbf37a)
+++ introduction/welcome/changelog.xml	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
@@ -45,4 +45,13 @@
 -->
     <listitem>
+      <para>June 2nd, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to blfs-systemd-units-20160602.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 31st, 2016</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision af8b2d902874a0798738669432f316723ecbf37a)
+++ packages.ent	(revision f139a18c916c4f2b072d79ff13d972272ee17ab4)
@@ -259,4 +259,5 @@
 <!ENTITY strigi-version               "0.7.8">
 <!ENTITY sysstat-version              "11.3.4">
+<!ENTITY systemd-version              "230">
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
 <!ENTITY udisks2-version              "2.1.7">    <!-- stable lt .90 micro version -->
