Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ chapter01/changelog.xml	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -48,4 +48,18 @@
       <itemizedlist>
         <listitem>
+           <para>[bdubbs] - Update to attr-2.4.48.  Fixes 
+           <ulink url="&lfs-ticket-root;4308">#4308</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to acl-2.2.53.  Fixes 
+           <ulink url="&lfs-ticket-root;4307">#4307</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2018-06-25</para>
+      <itemizedlist>
+        <listitem>
            <para>[bdubbs] - Various URL updates.  Fixes 
            <ulink url="&lfs-ticket-root;4299">#4293</ulink> and
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ chapter01/whatsnew.xml	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -27,7 +27,7 @@
     <para>None</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Acl-&acl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Attr-&attr-version;</para>
Index: chapter06/acl.xml
===================================================================
--- chapter06/acl.xml	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ chapter06/acl.xml	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -43,33 +43,16 @@
     <title>Installation of Acl</title>
 
-    <para>Modify the documentation directory so that it is a versioned
-    directory:</para>
-
-<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para>Fix some broken tests:</para>
-
-<screen><userinput remap="pre">sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
-
-    <para>Fix a problem in the test procedures caused by changes in perl-5.26:</para>
-
-<screen><userinput remap="pre">sed -i 's/{(/\\{(/' test/run</userinput></screen>
-
-    <para>Additionally, fix a bug that causes <command>getfacl -e</command>
-    to segfault on overly long group name:</para>
-
-<screen><userinput remap="pre">sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \
-    libacl/__acl_to_any_text.c</userinput></screen>
-
     <para>Prepare Acl for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr    \
-            --bindir=/bin    \
-            --disable-static \
-            --libexecdir=/usr/lib</userinput></screen>
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr         \
+            --bindir=/bin         \
+            --disable-static      \
+            --libexecdir=/usr/lib \
+            --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr    \
-            --disable-static \
-            --libexecdir=/usr/lib</userinput></screen>
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr         \
+            --disable-static      \
+            --libexecdir=/usr/lib \
+            --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -79,12 +62,11 @@
     <para>The Acl tests need to be run on a filesystem that supports access
     controls after <application>Coreutils</application> has been built with the
-    Acl libraries.  If desired, return to this package and run <command>make -j1
-    tests</command> after <application>Coreutils</application> has been built
+    Acl libraries.  If desired, return to this package and run <command>make
+    check</command> after <application>Coreutils</application> has been built
     later in this chapter.</para>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install install-dev install-lib
-chmod -v 755 /usr/lib/libacl.so</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>The shared library needs to be moved to
Index: chapter06/attr.xml
===================================================================
--- chapter06/attr.xml	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ chapter06/attr.xml	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -42,26 +42,16 @@
     <title>Installation of Attr</title>
 
-    <para>Modify the documentation directory so that it is a versioned
-    directory:</para>
-
-<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para>Prevent installation of manual pages that were already installed by
-    the <xref linkend="man-pages"/> package:</para>
-
-<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
-
-    <para>Fix a problem in the test procedures caused by changes in perl-5.26:</para>
-
-<screen><userinput remap="pre">sed -i 's:{(:\\{(:' test/run</userinput></screen>
-
     <para>Prepare Attr for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr \
-            --bindir=/bin \
-            --disable-static</userinput></screen>
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr     \
+            --bindir=/bin     \
+            --disable-static  \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr \
-            --disable-static</userinput></screen>
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr     \
+            --disable-static  \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -70,14 +60,12 @@
 
     <para>The tests need to be run on a filesystem that supports extended
-    attributes such as the ext2, ext3, or ext4 filesystems. The tests are also
-    known to fail if running multiple simultaneous tests (-j option greater than
-    1).  To test the results, issue:</para>
+    attributes such as the ext2, ext3, or ext4 filesystems. 
+    To test the results, issue:</para>
 
-<screen><userinput remap="test">make -j1 tests root-tests</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install install-dev install-lib
-chmod -v 755 /usr/lib/libattr.so</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>The shared library needs to be moved to
Index: general.ent
===================================================================
--- general.ent	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ general.ent	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20180625">
+<!ENTITY version         "SVN-20180703">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180625-systemd">
+<!ENTITY versiond        "20180703-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "June 25, 2018">
+<!ENTITY releasedate     "July 3, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: lfs-latest.php
===================================================================
--- lfs-latest.php	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ lfs-latest.php	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -235,5 +235,5 @@
        $package == "acl"  )
   {
-     return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.src.*$/" );
+     return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.*$/" );
   }
 
Index: packages.ent
===================================================================
--- packages.ent	(revision db1ed0172ad42bd109c8dbdca90253077f4e7c34)
+++ packages.ent	(revision f6528ac86d1a9dc96170011ae98ee0160b28abda)
@@ -7,16 +7,16 @@
      Allowed deviation in disk usage : 2% -->
 
-<!ENTITY acl-version "2.2.52">
-<!ENTITY acl-size "380 KB">
-<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.src.tar.gz">
-<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
+<!ENTITY acl-version "2.2.53">
+<!ENTITY acl-size "513 KB">
+<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
+<!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
 <!ENTITY acl-home " ">
 <!ENTITY acl-ch6-du "4.9 MB">
 <!ENTITY acl-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY attr-version "2.4.47">
-<!ENTITY attr-size "336 KB">
-<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.src.tar.gz">
-<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
+<!ENTITY attr-version "2.4.48">
+<!ENTITY attr-size "457 KB">
+<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
+<!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-ch6-du "3.3 MB">
