diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 229f5a9a55..13c9a4a620 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -413,7 +413,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 	}
 
 	HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
-		= "export LIBRARY_PATH=$LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ;
+		= "export \"LIBRARY_PATH=$LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ;
 	HOST_PTHREAD_LINKFLAGS = ;
 	HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ;
 	HOST_DEFINES += __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS ;
@@ -430,10 +430,10 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 			= "export PATH=$PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ;
 	} else if $(HOST_PLATFORM) = darwin {
 		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
-			= "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ;
+			= "export \"DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ;
 	} else {
 		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
-			= "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ;
+			= "export \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ;
 	}
 
 	HOST_PTHREAD_LINKFLAGS = -pthread ;
diff --git a/configure b/configure
index 097abbaadf..2eefb7d502 100755
--- a/configure
+++ b/configure
@@ -216,7 +216,7 @@ real_path()
 relative_to()
 {
 	perl -e 'use File::Spec; print File::Spec->abs2rel(@ARGV) . "\n"' \
-		$1 $2
+		"$1" "$2"
 }
 
 # valid_toolchain
@@ -525,7 +525,7 @@ if [ "$1" = "--update" ]; then
 			"encoded into '$buildConfigFile' - updating not possible."
 		exit 1
 	fi
-	cd $lastPwd
+	cd "$lastPwd"
 	if [ -n "$lastEnv" ]; then
 		export $lastEnv
 	fi
@@ -556,7 +556,7 @@ if [ `umask` -gt 22 ]; then
 	exit 1
 fi
 # ensure git checkout was not done with a restrictive umask
-if [ `stat -c '%a' $sourceDir/data/system/boot/SetupEnvironment` -lt 644 ]; then
+if [ `stat -c '%a' "$sourceDir/data/system/boot/SetupEnvironment"` -lt 644 ]; then
 	echo "The source tree was cloned with a umask > 0022. It seems you"
 	echo have already corrected your umask, but not re-checked-out the
 	echo source tree. Try running:
@@ -1055,7 +1055,7 @@ HOST_EXTENDED_REGEX_SED		?= ${HOST_EXTENDED_REGEX_SED} ;
 HOST_SHA256					?= ${HOST_SHA256} ;
 HAIKU_NASM					?= ${HAIKU_NASM} ;
 
-HAIKU_BUILD_ATTRIBUTES_DIR	?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
+HAIKU_BUILD_ATTRIBUTES_DIR	?= "${HAIKU_BUILD_ATTRIBUTES_DIR}" ;
 
 HOST_HAIKU_PORTER			?= ${HOST_HAIKU_PORTER} ;
 HAIKU_PORTS					?= ${HAIKU_PORTS} ;
diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile
index 779126bad0..b665621d61 100644
--- a/src/build/libroot/Jamfile
+++ b/src/build/libroot/Jamfile
@@ -13,7 +13,7 @@ UsePrivateBuildHeaders kernel libroot system ;
 
 {
 	local defines = [ FDefines
-		HAIKU_BUILD_ATTRIBUTES_DIR="\\\"$(HAIKU_BUILD_ATTRIBUTES_DIR)\\\""
+		'HAIKU_BUILD_ATTRIBUTES_DIR="\"$(HAIKU_BUILD_ATTRIBUTES_DIR)\""'
 		_HAIKU_BUILD_DONT_REMAP_FD_FUNCTIONS=1
 	] ;
 	SubDirCcFlags $(defines) ;