diff --git a/Makefile b/Makefile
index 36f95b08f..c6f8f8e02 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,13 @@ lfs: validate profile-html
 	  mkdir -p $(BASEDIR)/stylesheets; \
 	fi;
 	$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
+	$(Q)pushd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html; popd
+
 	$(Q)if [ ! -e $(BASEDIR)/images ]; then \
 	  mkdir -p $(BASEDIR)/images; \
 	fi;
 	$(Q)cp images/*.png $(BASEDIR)/images
-	$(Q)cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
-#	$(Q)cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html
+#	$(Q)pushd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html; popd
 
 	@echo "Running Tidy and obfuscate.sh..."
 	$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dc2ab5006..3e1681c18 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,20 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2015-08-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2015f. Fixes
+          <ulink url="&lfs-ticket-root;3830">#3830</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add a workaround to ncurses in 
+          Chapter 5 for hosts that have mawk installed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-08-11</para>
       <itemizedlist>
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index a18a9c819..d137ca880 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -43,6 +43,10 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
+    <para>First, ensure that gawk is found first during configuration:</para>
+
+<screen><userinput remap="pre">sed s/mawk// configure</userinput></screen>
+
     <para>Prepare Ncurses for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools \
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 12166a8ea..ddad6087b 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -55,7 +55,7 @@
 
     <para>This takes a long time, about 4.7 SBUs. In addition, 6 tests are skipped
     that use Automake. For full test coverage, Autoconf can be re-tested
-    after Automake has been installed.  In addition, one test fails due to
+    after Automake has been installed.  In addition, two tests fail due to
     changes in libtool-2.4.3 and later.</para>
 
     <para>Install the package:</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2bbbf22b4..dc3fca7c4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -103,8 +103,9 @@ cd ../glibc-build</userinput></screen>
     <itemizedlist>
 
       <listitem>
-        <para>posix/tst-getaddrinfo4 will always fail 
-        due to not having a network connection when the tests are run.</para>
+        <para><emphasis>posix/tst-getaddrinfo4</emphasis> will always fail due
+        to not having the necessary  networking applications when the tests are
+        run.</para>
       </listitem>
 
       <listitem>
@@ -119,6 +120,12 @@ cd ../glibc-build</userinput></screen>
         systems where the CPU is not a relatively new genuine Intel or
         authentic AMD processor.</para>
       </listitem>
+
+      <listitem>
+        <para>The <emphasis>elf/tst-protected1a</emphasis> and
+        <emphasis>elf/tst-protected1a</emphasis> tests are known to
+        fail with the current stable version of binutils.</para>
+      </listitem>
 <!--
       <listitem>
         <para>When running on older and slower hardware or on systems under
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 464862a87..c2eab482b 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -96,6 +96,10 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>One test, <emphasis>libls.sh</emphasis>, is known to fail due to hard
+    coding of some support program paths.  All tests pass if the tests are
+    rerun at the end of Chapter 6.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/general.ent b/general.ent
index 7cc27b13c..e8bbde23c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20150811">
+<!ENTITY version         "SVN-20150816">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "August 11, 2015">
+<!ENTITY releasedate     "August 16, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 0cfec3d04..62641d521 100644
--- a/packages.ent
+++ b/packages.ent
@@ -577,10 +577,10 @@
 <!ENTITY texinfo-ch6-du "109 MB">
 <!ENTITY texinfo-ch6-sbu "0.5 SBU">
 
-<!ENTITY tzdata-version "2015e">
-<!ENTITY tzdata-size "290 KB">
+<!ENTITY tzdata-version "2015f">
+<!ENTITY tzdata-size "292 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "36f9056efb432ca945c73397acfce0d4">
+<!ENTITY tzdata-md5 "e3b82732d20e973e48af1c6f13df9a1d">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
 <!ENTITY udev-lfs-version "udev-lfs-20140408">