diff --git a/TODO b/TODO
index cc5b921..99041b6 100644
--- a/TODO
+++ b/TODO
@@ -5,21 +5,19 @@
 MASTER SCRIPT
 -------------
 
-  - For CLFS book sources http://svn.cross-lfs.org should be used.
-
   - Update README to reflect the new work-flow.
 
 
 xLFS MODULES
 ------------
 
-  - To create Makefile entries to build blfs-tool dependencies.
-    Test LFS integration and port it to orher books.
+  - Test current BLFS_TOOL Makefile integration in LFS and CLFS.
+    Port it to CLFS-2 and HLFS, if possible.
 
-  - To develop a new restart code.
+  - To develop a new "restart" Makefile target code.
 
   - To add support for copying to the final system pre-generated
-    configuration files created by the user.
+    configuration files created by the user, if that can be implemented.
 
 
 BLFS MODULE (See BLFS/TODO)
@@ -31,5 +29,8 @@ OTHERS
 
   - Add a Customization file discussing how to hack the generated scripts
     and Makefiles, using the Cracklib support for Shadow in LFS as an example.
-    NOTE: that could require a special command line switch to regenerate the
-    Makefile if additional scripts are manually added to the *-commands/*/ dirs.
+
+    NOTE:
+      That requires a way to can regenerate the Makefile if additional
+      scripts are manually added to the *-commands/*/ dirs.
+
diff --git a/jhalfs b/jhalfs
index 2d29515..4a13869 100755
--- a/jhalfs
+++ b/jhalfs
@@ -90,10 +90,6 @@ source configuration
 [[ $? > 0 ]] && echo "file:configuration did not load.." && exit 1
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
-      #--- Envars not sourced from configuration
-declare -r SVN="svn://svn.linuxfromscratch.org"
-declare -r LOG=000-masterscript.log
-
 # These are boolean vars generated from Config.in.
 # ISSUE: If a boolean parameter is not set <true> that
 # variable is not defined by the menu app. This can
@@ -133,7 +129,7 @@ case $BRANCH_ID in
   2.4-branch )
     LFSVRS=${BRANCH_ID}
     TREE=branches/2.4-branch
-    ;;    
+    ;;
   * )
     case $PROGNAME in
       lfs | hlfs )
@@ -231,6 +227,15 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
   GPM_PATCH_2_MD5="bf6cbefe20c6f15b587f19ebc1c8a37a"
 fi
 
+#--- Envars not sourced from configuration
+case $PROGNAME in
+  clfs* ) declare -r SVN="http://svn.cross-lfs.org/svn/repos" ;;
+      * ) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
+esac
+declare -r LOG=000-masterscript.log
+  # Needed to can fetch BLFS book sources when building CLFS
+declare -r SVN_2="svn://svn.linuxfromscratch.org"
+
 # Set true internal variables
 COMMON_DIR="common"
 PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z])
@@ -391,7 +396,7 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
   echo -n "Downloading the BLFS document, $BLFS_BRANCH_ID version... "
   if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
     mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
-    svn co $SVN/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
+    svn co $SVN_2/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
   else
     pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null
       svn up >>$LOGDIR/$LOG 2>&1