diff --git a/install-blfs-tools.sh b/install-blfs-tools.sh
index 82e8a61..e78bfbc 100755
--- a/install-blfs-tools.sh
+++ b/install-blfs-tools.sh
@@ -116,9 +116,11 @@ source $COMMON_DIR/libs/func_check_version.sh
 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
 
 case $BLFS_BRANCH_ID in
-  development )  BLFS_TREE=trunk/BOOK ;;
-     branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
-            * )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+     development )  BLFS_TREE=trunk/BOOK ;;
+      branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
+        branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
+6.2* | 7.* | 8.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+               * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
 esac
 
 # Check for build prerequisites.
diff --git a/jhalfs b/jhalfs
index a436296..67a270e 100755
--- a/jhalfs
+++ b/jhalfs
@@ -173,7 +173,7 @@ case $BRANCH_ID in
       lfs )
         LFSVRS=${BRANCH_ID}
         TREE=branches/${BRANCH_ID#branch-}
-        if [ ${BRANCH_ID#branch-} = 6 ]; then
+        if [ ${BRANCH_ID:7:1} = 6 ]; then
             TREE=${TREE}/BOOK
         fi
         ;;
@@ -292,9 +292,9 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
            *EDIT* )  echo " You forgot to set the BLFS branch or stable book version."
                      echo " Please rerun make and fix the configuration."
                      exit 2 ;;
-   branch-systemd )  BLFS_TREE=branches/systemd ;;
-         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
-       6.2* | 7.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+       branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
+         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
+  6.2* | 7.* | 8.*)  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
                 * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
     esac
   fi