Index: book/bookinfo.xml
===================================================================
--- book/bookinfo.xml	(revision 92963e5bf470f399c2e967930207154dc0ffa218)
+++ book/bookinfo.xml	(revision ee92087f20af76ece6742c1d0589ca9f5e86c5cc)
@@ -11,5 +11,5 @@
   <date>$Date$</date>
 
-  <title>Beyond Linux<superscript>&reg;</superscript> From Scratch</title>
+  <title>Beyond Linux<superscript>&reg;</superscript> From Scratch<phrase revision="systemd"> (systemd edition)</phrase></title>
   <subtitle>Version &version;</subtitle>
 
Index: general.ent
===================================================================
--- general.ent	(revision 92963e5bf470f399c2e967930207154dc0ffa218)
+++ general.ent	(revision ee92087f20af76ece6742c1d0589ca9f5e86c5cc)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "04">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 2nd &year;">
+<!ENTITY releasedate  "June 4th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 92963e5bf470f399c2e967930207154dc0ffa218)
+++ introduction/welcome/changelog.xml	(revision ee92087f20af76ece6742c1d0589ca9f5e86c5cc)
@@ -44,8 +44,18 @@
 
 -->
+    <listitem>
+      <para>June 4th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Add local user and Linux-PAM configuration to vsftpd.
+          Fixes <ulink url="&blfs-ticket-root;7896">#7896</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>June 2nd, 2016</para>
       <itemizedlist>
-        <listitem revision="systemd">
+        <listitem>
           <para>[dj] - Update to blfs-systemd-units-20160602.tar.xz.</para>
         </listitem>
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision 92963e5bf470f399c2e967930207154dc0ffa218)
+++ server/major/vsftpd.xml	(revision ee92087f20af76ece6742c1d0589ca9f5e86c5cc)
@@ -178,12 +178,48 @@
 EOF</userinput></screen>
 
+      <para>To enable local logins, append the following to the
+      <filename>/etc/vsftpd.conf</filename> file (as the
+      <systemitem class="username">root</systemitem> user):</para>
+
+<screen><userinput role="root">cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
+<literal>local_enable=YES</literal>
+EOF</userinput></screen>
+
+      <para>In additon, if using <application>Linux-PAM</application> and
+      <application>vsftpd</application> with local user logins, you will need
+      a <application>Linux-PAM</application> configuration file. As the
+      <systemitem class="username">root</systemitem> user, create the
+      <filename>/etc/pam.d/vsftpd</filename> file, and add the needed
+      configuration changes for <application>Linux-PAM</application> session
+      support using the following commands:</para>
+
+<screen><userinput role="root">cat &gt; /etc/pam.d/vsftpd &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/pam.d/vsftpd
+auth       required     /lib/security/pam_listfile.so item=user sense=deny \
+                                                      file=/etc/ftpusers \
+                                                      onerr=succeed
+auth       required     pam_shells.so
+auth       include      system-auth
+account    include      system-account
+session    include      system-session</literal>
+EOF
+
+cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
+<literal>session_support=YES
+pam_service_name=vsftpd</literal>
+EOF</userinput></screen>
+
     </sect3>
 
     <sect3  id="vsftpd-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/rc.d/init.d/vsftpd</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 revision="sysv">Install the
+      <filename>/etc/rc.d/init.d/vsftpd</filename> init script included in the
+      <xref linkend="bootscripts" revision="sysv"/> package.</para>
+
+      <para revision="systemd">Install the <filename>vsftpd.service</filename>
+      unit included in the
       <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
