diff -Naur curjhalfs/CLFS/clfs.xsl newjhalfs/CLFS/clfs.xsl
--- curjhalfs/CLFS/clfs.xsl	2007-08-17 09:24:47.000000000 -0700
+++ newjhalfs/CLFS/clfs.xsl	2010-09-11 16:20:31.000000000 -0700
@@ -216,9 +216,9 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <!-- Fixing toolchain test suites run -->
+      <!-- Fixing toolchain test suites run XXX more to fix -->
       <xsl:when test="string() = 'make check' or
-                string() = 'make -k check'">
+                contains(string(), 'make -k check')">
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
             <xsl:choose>
@@ -283,6 +283,9 @@
       <xsl:when test="ancestor::sect1[@id='ch-system-glibc']">
         <xsl:value-of select="$timezone"/>
       </xsl:when>
+      <xsl:when test="ancestor::sect1[@id='ch-system-eglibc']">
+        <xsl:value-of select="$timezone"/>
+      </xsl:when>
       <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
         <xsl:value-of select="$page"/>
       </xsl:when>
diff -Naur curjhalfs/CLFS/master.sh newjhalfs/CLFS/master.sh
--- curjhalfs/CLFS/master.sh	2010-09-12 07:39:21.000000000 -0700
+++ newjhalfs/CLFS/master.sh	2010-09-12 07:43:49.000000000 -0700
@@ -225,6 +225,7 @@
     pkg_tarball=$(get_package_tarball_name $name)
 
     # This is very ugly:: util-linux is in /chroot but must be run under LUSER
+    # Same for e2fsprogs (in CLFS 1.1.0)
     # .. Customized makefile entry
     case "${this_script}" in
       *util-linux*)
@@ -236,6 +237,15 @@
          wrt_touch
          temptools="$temptools $this_script"
          continue ;;
+      *e2fsprogs)
+         LUSER_wrt_target "${this_script}" "$PREV"
+         LUSER_wrt_unpack "$pkg_tarball"
+         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         LUSER_wrt_RunAsUser "${file}"
+         LUSER_RemoveBuildDirs "${name}"
+         wrt_touch
+         temptools="$temptools $this_script"
+         continue ;;
      esac
 
 
@@ -518,7 +528,7 @@
       CHROOT_Unpack "$pkg_tarball"
       # If the testsuites must be run, initialize the log file
       case $name in
-        binutils | gcc | glibc )
+        binutils | gcc | glibc | eglibc )
           [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
           ;;
         * )