diff --git a/bin/lb b/bin/lb
index 7ea44cdb1..63c74988a 100755
--- a/bin/lb
+++ b/bin/lb
@@ -57,6 +57,10 @@ case "${1}" in
 		then
 			# User has live-build copied locally in the system
 			SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
+		elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
+		then
+			# User has live-build embedded in the config
+			SCRIPT="local/live-build/scripts/build/${COMMAND}"
 		elif [ -x /usr/lib/live/build/${COMMAND} ]
 		then
 			# User has live-build installed in the system
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 90d3ac416..b18d46549 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -15,8 +15,7 @@ Set_defaults ()
 	if [ -e local/live-build ]
 	then
 		LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
-		PATH="${PWD}/local/live-build/scripts/build:${PATH}"
-		export LIVE_BUILD PATH
+		export LIVE_BUILD
 	fi
 
 	# Setting system type
diff --git a/scripts/build.sh b/scripts/build.sh
index fbe3e921f..b8846a4a2 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -3,8 +3,7 @@
 if [ -e local/live-build ]
 then
 	LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
-	PATH="${PWD}/local/live-build/scripts/build:${PATH}"
-	export LIVE_BUILD PATH
+	export LIVE_BUILD
 fi
 
 # Source global functions