diff --git a/tools/distro-tool b/tools/distro-tool
index c098748ba1..d93ab47605 100755
--- a/tools/distro-tool
+++ b/tools/distro-tool
@@ -726,7 +726,7 @@ get_libreelec_branch() {
 get_libreelec_option() {
   local variable="$1"
   cd $LIBREELEC_DIR
-  . config/options
+  source config/options ""
   echo "${!variable}"
 }
 
@@ -759,13 +759,18 @@ generate_work() {
   # Generate workload using multiple threads
   init_progress
 
-  tcount=0
-  while [ : ]; do
-    tcount=$((tcount + 1))
-    [ ${tcount} -gt ${WORKER_MAX} ] && break
-    generate_work_worker ${pcount} ${tcount} ${revision} &
-  done
-  wait
+  (
+    cd $LIBREELEC_DIR
+    source config/options ""
+
+    tcount=0
+    while [ : ]; do
+      tcount=$((tcount + 1))
+      [ ${tcount} -gt ${WORKER_MAX} ] && break
+      generate_work_worker ${pcount} ${tcount} ${revision} &
+    done
+    wait
+  )
 
   end_progress