diff --git a/build-image.sh b/build-image.sh
index 4f06e8d..5b6c00a 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -34,14 +34,12 @@ target=$(. "$CONTROL"; echo "${TARGET}")
 subtarget=$(. "$CONTROL"; echo "${SUBTARGET}")
 
 (
-    IFS='
-'
     # `make` below consumes these
     export PROFILE PACKAGES
 
     . "$CONTROL"
 
-    tmp=$(mktemp --tmpdir -d files.XXXXXXXXX)
+    tmp="$(mktemp --tmpdir -d files.XXXXXXXXX)"
 
     mkdir -p "$tmp"/etc
     echo "$VERSION" > "$tmp"/etc/its-access-point-version