diff --git a/CLFS3/clfs3.xsl b/CLFS3/clfs3.xsl
index ebd4bea..24057d1 100644
--- a/CLFS3/clfs3.xsl
+++ b/CLFS3/clfs3.xsl
@@ -71,6 +71,11 @@
               <xsl:text>set -e&#xA;</xsl:text>
             </xsl:if>
             <xsl:text>&#xA;</xsl:text>
+            <!-- Set envars needed by uClibc -->
+            <xsl:if test="@id='ch-cross-tools-uclibc'">
+              <xsl:copy-of select="//sect1[@id='ch-cross-tools-toolchain']/screen"/>
+              <xsl:text>&#xA;&#xA;</xsl:text>
+            </xsl:if>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
             </xsl:if>
diff --git a/CLFS3/master.sh b/CLFS3/master.sh
index 138181c..f90a057 100644
--- a/CLFS3/master.sh
+++ b/CLFS3/master.sh
@@ -144,7 +144,7 @@ cross_tools_Makefiles() {     #
     #   had older versions. The packages would be installed in the target directory
     #   and not the host.
     case $this_script in
-      *cflags* | *variables* | *abi )  # work done in host_prep_Makefiles
+      *cflags* | *variables* | *abi | *toolchain*)  # work done in host_prep_Makefiles
               continue ;;
       *) ;;
     esac