diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl
index c8f5e47..4b01972 100644
--- a/HLFS/hlfs.xsl
+++ b/HLFS/hlfs.xsl
@@ -96,7 +96,7 @@
              <xsl:text>pushd ../; tar -xvf gettext-&gettext-version;.*; popd; &#xA;</xsl:text>
           </xsl:if>
 
-          <!-- NEW toolchain format, from inside ./sources dir unpack binutils and gcc -->
+          <!-- SVN toolchain format, from inside ./sources dir unpack binutils and gcc -->
 	  <xsl:if test="@id='ch-tools-embryo-toolchain' or
                         @id='ch-tools-cocoon-toolchain' or
                         @id='ch-system-butterfly-toolchain'">
@@ -111,7 +111,16 @@
           <xsl:if test="@id='ch-system-butterfly-toolchain' and $testsuite != '0'">
             <xsl:text>tar -xvf gcc-testsuite-&gcc-version;.*; &#xA;</xsl:text>
           </xsl:if>
-          <!-- END new toolchain format -->
+          <!-- END SVN toolchain format -->
+
+          <!-- 2.4-branch toolchain -->
+          <xsl:if test="@id='ch-tools-gcc-pass2' or @id='ch-system-gcc'">
+             <xsl:text>pushd ../; tar -xvf gcc-g++-&gcc-version;.*; popd; &#xA;</xsl:text>
+          </xsl:if>
+          <xsl:if test="@id='ch-system-gcc' and $testsuite != '0'">
+            <xsl:text>pushd ../; tar -xvf gcc-testsuite-&gcc-version;.*; popd; &#xA;</xsl:text>
+          </xsl:if>
+          <!-- END 2.4-branch toolchain -->
 
           <xsl:if test="@id='bootable-bootscripts'">
              <xsl:text>pushd ../; tar -xvf blfs-bootscripts-&blfs-bootscripts-version;.* ; popd; &#xA;</xsl:text>
@@ -166,6 +175,13 @@
       <xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and
                 contains(string(),'sysctl')
                 and $grsecurity_host ='n'"/>
+      <!-- Fix MAKEDEV installation in 2.4-branch -->
+      <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
+                contains(string(),'bzcat MAKEDEV')">
+        <xsl:text>bzcat /sources/</xsl:text>
+        <xsl:value-of select="substring-after(string(),'bzcat ')"/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:when>
       <!-- Setting $LC_ALL and $LANG for /etc/profile -->
       <xsl:when test="ancestor::sect1[@id='bootable-profile'] and
                 contains(string(),'export LANG=')">
@@ -233,12 +249,14 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <!-- Fixing butterfly toolchain and other packages test suites run -->
+      <!-- Fixing butterfly and 2.4-branch toolchain plus other packages test suites run -->
       <xsl:when test="string() = 'make -k check'
                       or string() = 'make check'
                       or string() = 'make tests'">
         <xsl:choose>
-          <xsl:when test="(ancestor::sect1[@id='ch-system-butterfly-toolchain']
+          <xsl:when test="((ancestor::sect1[@id='ch-system-butterfly-toolchain']
+                          or ancestor::sect1[@id='ch-system-gcc'] or
+                          ancestor::sect1[@id='ch-system-binutils'])
                           and $testsuite != '0') or
                           $testsuite = '2' or $testsuite = '3'">
             <xsl:choose>
diff --git a/HLFS/master.sh b/HLFS/master.sh
index eb12231..39af2bc 100644
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -190,7 +190,7 @@ chapter5_Makefiles() {       # Bootstrap or temptools phase
     chapter5="$chapter5 $this_script"
 
     # Grab the name of the target
-    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
+    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's@-pass[0-9]\{1\}@@'`
 
     # Adjust 'name'
     case $name in
@@ -220,8 +220,11 @@ chapter5_Makefiles() {       # Bootstrap or temptools phase
     #
     LUSER_wrt_target "$this_script" "$PREV"
     # Find the version of the command files, if it corresponds with the building of
-    # a specific package
-    pkg_tarball=$(get_package_tarball_name $name)
+    # a specific package. Fix GCC tarball name for 2.4-branch.
+    case $name in
+      gcc ) pkg_tarball=$(get_package_tarball_name gcc-core) ;;
+        * ) pkg_tarball=$(get_package_tarball_name $name) ;;
+    esac
     # If $pkg_tarball isn't empty, we've got a package...
     if [ "$pkg_tarball" != "" ] ; then
       # Insert instructions for unpacking the package and to set the PKGDIR variable.
@@ -306,8 +309,11 @@ chapter6_Makefiles() {       # sysroot or chroot build phase
     esac
 
     # Find the version of the command files, if it corresponds with the building of
-    # a specific package
-    pkg_tarball=$(get_package_tarball_name $name)
+    # a specific package. Fix GCC tarball name for 2.4-branch.
+    case $name in
+      gcc ) pkg_tarball=$(get_package_tarball_name gcc-core) ;;
+        * ) pkg_tarball=$(get_package_tarball_name $name) ;;
+    esac
 
     if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then
       case "${this_script}" in
@@ -349,11 +355,11 @@ chapter6_Makefiles() {       # sysroot or chroot build phase
       CHROOT_Unpack "$pkg_tarball"
       # If the testsuites must be run, initialize the log file
       # butterfly-toolchain tests are enabled in 'process_tookchain' function
+      # 2.4-branch toolchain is ernabled here.
       case $name in
-        glibc ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
-          ;;
-	    * ) [[ "$TEST" > "1" ]]  && CHROOT_wrt_test_log "${this_script}"
-          ;;
+        glibc | gcc | binutils)
+            [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" ;;
+        * ) [[ "$TEST" > "1" ]]  && CHROOT_wrt_test_log "${this_script}" ;;
       esac
       # If using optimizations, write the instructions
       [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"