diff --git a/.travis.yml b/.travis.yml
index 1b7c18e..223f4d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@
 # SC1090: file sourcing   - shellcheck is unaware of sourced pkgfiles
 # SC2154: undeclared vars - shellcheck is unaware vars inside pkgfiles
 # SC2120: unused arguments - shellcheck is unaware of pkgfile function calls
+# SC2295: Expansions with '#' - shellcheck thinks "#" which we are using as
+#                               package version delimiter isn't taken literally
 # ----- portfiles only:
 # SC2034: unused variables - shellcheck is unaware of pkgfile vars use
 # SC2016: expressions in single quotes don't expand - often in sed calls within pkgfiles (intentional)
@@ -10,5 +12,5 @@
 # SC2164: 'use || exit in case cd fails' -- only used when will never fail
 script:
   - make
-  - shellcheck -s sh -e 1090 -e 2154 -e 2120 bonsai
+  - shellcheck -s sh -e 1090 -e 2154 -e 2120 -e 2295 bonsai
   - shellcheck -s sh -e 1090 -e 2154 -e 2034 -e 2016 -e 2086 -e 2209 -e 2164 ports/*/*/pkgfile
diff --git a/src/build b/src/build
index 3f953b2..97ba14f 100644
--- a/src/build
+++ b/src/build
@@ -52,7 +52,7 @@ getflags() {
     [ -x "$BONSAI_ROOT"/bin/pkgconf  ] && PKG_CONFIG="$BONSAI_ROOT"/bin/pkgconf
 
     # User flags
-    export JOBS=${JOBS:-1} CFLAGS LDFLAGS CPPFLAGS CXXFLAGS \
+    export JOBS="${JOBS:-1}" CFLAGS LDFLAGS CPPFLAGS CXXFLAGS \
            LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH \
            BINDIR LIBDIR SBINDIR LIBEXECDIR MANDIR
 
@@ -85,7 +85,7 @@ getflags() {
     # export CC="${CC:-gcc}" CXX="${CXX:-g++}"
 
     # System flags
-    export LIBTOOL=${LIBTOOL:-libtool} PKG_CONFIG=${PKG_CONFIG:-pkg-config} \
+    export LIBTOOL="${LIBTOOL:-libtool}" PKG_CONFIG="${PKG_CONFIG:-pkg-config}" \
            cc="$CC" DESTDIR="$pkg" PREFIX=/ prefix=/ MAKEINFO=false
 }