diff --git a/Makefile b/Makefile
index f173b59a3..34b94eb62 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,6 @@ lfs: validate profile-html
 	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
 
 	@echo "Running Tidy and obfuscate.sh..."
 	$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
@@ -76,6 +75,10 @@ nochunks: validate profile-html
 	  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 	$(Q)$(MAKE) wget-list
 
+epub: validate
+	@echo "Generating ePub..."
+	$(Q)xsltproc --nonet stylesheets/lfs-xsl/epub.xsl $(RENDERTMP)/lfs-full.xml
+
 tmpdir:
 	@echo "Creating and cleaning $(RENDERTMP)"
 	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ce70a3bf9..d8b7eb525 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -27,8 +27,8 @@
     </listitem> -->
     <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Automake &automake-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -69,11 +69,11 @@
     </listitem>-->
     <!--<listitem>
       <para>Flex &flex-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Gawk &gawk-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>GCC &gcc-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -84,11 +84,11 @@
     </listitem>-->
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>GMP &gmp-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Grep &grep-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -108,11 +108,11 @@
     </listitem>-->
     <!--<listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -138,14 +138,14 @@
     </listitem>-->
     <!--<listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Man-pages &man-pages-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>MPC &mpc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>MPFR &mpfr-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -223,12 +223,6 @@
       <para>&glibc-installation-patch;</para>
     </listitem>
 
-
-<!--  Added and removed in this cycle
-    <listitem>
-      <para>popt&popt-version;</para>
-    </listitem>
--->
   </itemizedlist>
 
   <itemizedlist>
diff --git a/stylesheets/lfs-xsl/chunk-master.xsl b/stylesheets/lfs-xsl/chunk-master.xsl
index 893747712..4733a3d3c 100644
--- a/stylesheets/lfs-xsl/chunk-master.xsl
+++ b/stylesheets/lfs-xsl/chunk-master.xsl
@@ -18,10 +18,10 @@ $Date$
   <xsl:import href="chunk-slave.xsl"/>
 
     <!-- Upstream chunk code named templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
+  <xsl:import href="docbook-xsl-1.77.1/xhtml/chunk-common.xsl"/>
 
     <!-- Upstream chunk code match templates -->
-  <xsl:include href="docbook-xsl-snapshot/xhtml/chunk-code.xsl"/>
+  <xsl:include href="docbook-xsl-1.77.1/xhtml/chunk-code.xsl"/>
 
     <!-- Including our customized chunks templates -->
   <xsl:include href="xhtml/lfs-index.xsl"/>
diff --git a/stylesheets/lfs-xsl/chunk-slave.xsl b/stylesheets/lfs-xsl/chunk-slave.xsl
index a677e67fb..c5a8045a8 100644
--- a/stylesheets/lfs-xsl/chunk-slave.xsl
+++ b/stylesheets/lfs-xsl/chunk-slave.xsl
@@ -13,7 +13,7 @@ $Date$
         Sets global params and include customized elements templates. -->
 
     <!-- Upstream XHTML presentation templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
+  <xsl:import href="docbook-xsl-1.77.1/xhtml/docbook.xsl"/>
 
     <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
   <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
@@ -31,7 +31,7 @@ $Date$
     The path from top-level HTML files (index.html, partX.html, etc) MUST be
     fixed via a sed in the Makefile-->
     <!-- Master CSS Stylesheet -->
-  <xsl:param name="html.stylesheet" select="'../stylesheets/lfs.css'"/>
+  <xsl:param name="html.stylesheet" select="'stylesheets/lfs.css'"/>
     <!-- Print CSS Stylesheet -->
     <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
   <xsl:template name='user.head.content'>
diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl
index 7f5cbcb8a..3652e5594 100644
--- a/stylesheets/lfs-xsl/nochunks.xsl
+++ b/stylesheets/lfs-xsl/nochunks.xsl
@@ -13,7 +13,7 @@ $Date$
         Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
 
     <!-- Upstream XHTML templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
+  <xsl:import href="docbook-xsl-1.77.1/xhtml/docbook.xsl"/>
 
     <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
   <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
diff --git a/stylesheets/lfs-xsl/pdf.xsl b/stylesheets/lfs-xsl/pdf.xsl
index a1c9f1991..126655f9d 100644
--- a/stylesheets/lfs-xsl/pdf.xsl
+++ b/stylesheets/lfs-xsl/pdf.xsl
@@ -14,7 +14,7 @@ $Date$
 
     <!-- Upstream FO templates. Profiled version is not supported by
          xsltproc, thus pofiling must be done in two steps (see Makefile) -->
-  <xsl:import href="docbook-xsl-snapshot/fo/docbook.xsl"/>
+  <xsl:import href="docbook-xsl-1.77.1/fo/docbook.xsl"/>
 
     <!-- Uncomment the next for debugging the raw FO code.
          Note that FOP will complaints about a lot of paragraph overflows
diff --git a/stylesheets/lfs-xsl/profile.xsl b/stylesheets/lfs-xsl/profile.xsl
index 1ea247c70..8ed029227 100644
--- a/stylesheets/lfs-xsl/profile.xsl
+++ b/stylesheets/lfs-xsl/profile.xsl
@@ -12,11 +12,11 @@ $Date$
        Replaces {docbook-xsl}/profiling/profile.xsl -->
 
   <!-- Include common profiling stylesheet -->
-  <xsl:import href="docbook-xsl-snapshot/profiling/profile-mode.xsl"/>
+  <xsl:import href="docbook-xsl-1.77.1/profiling/profile-mode.xsl"/>
 
     <!-- This file must be included, because profile-mode is using
          templates from it -->
-  <xsl:import href="docbook-xsl-snapshot/common/stripns.xsl"/>
+  <xsl:import href="docbook-xsl-1.77.1/common/stripns.xsl"/>
 
     <!-- In the two pass processing there is no need for base URI fixup -->
   <xsl:param name="profile.baseuri.fixup" select="false()"/>