diff --git a/build b/build
index 02b7bd38..1da3af43 100755
--- a/build
+++ b/build
@@ -42,10 +42,10 @@ buildbin() {
   local CMD=$(realpath $1)
   echo "Building: $CMD for $GOOS-$GOARCH"
 
-  (cd "$TARGET_PATH" && go build $ARGS -ldflags "${LDFLAGS}${LDFLAGS2}" -gcflags "$GCFLAGS" $CMD)
+  (cd "$TARGET_PATH" && go build $ARGS -ldflags "${LDFLAGS}${LDFLAGS2}" -gcflags "$GCFLAGS" "$CMD")
 
   if [ $UPX ]; then
-    upx --brute $CMD
+    upx --brute "$CMD"
   fi
 }
 
diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh
index 30622c19..0244484d 100644
--- a/contrib/deb/generate.sh
+++ b/contrib/deb/generate.sh
@@ -4,13 +4,13 @@
 # mesh and enables it in systemd. You can give it the PKGARCH= argument
 # i.e. PKGARCH=i386 sh contrib/deb/generate.sh
 
-if [ `pwd` != `git rev-parse --show-toplevel` ]
+if [ $(pwd) != $(git rev-parse --show-toplevel) ]
 then
   echo "You should run this script from the top-level directory of the git repo"
   exit 1
 fi
 
-PKGBRANCH=$(basename `git name-rev --name-only HEAD`)
+PKGBRANCH=$(basename $(git name-rev --name-only HEAD))
 PKG=$(sh contrib/semver/name.sh)
 PKGVERSION=$(sh contrib/semver/version.sh --bare)
 PKGARCH=${PKGARCH-amd64}
@@ -113,7 +113,7 @@ EOF
 cp mesh /tmp/$PKGNAME/usr/bin/
 cp meshctl /tmp/$PKGNAME/usr/bin/
 ln -s /usr/bin/meshctl /tmp/$PKGNAME/usr/local/bin/meshctl
-if [ $LOGLEVEL = "DEBUG" ]; then cp contrib/systemd/mesh-debug.service /tmp/$PKGNAME/etc/systemd/system/mesh.service
+if [ "$LOGLEVEL" = "DEBUG" ]; then cp contrib/systemd/mesh-debug.service /tmp/$PKGNAME/etc/systemd/system/mesh.service
 else
     cp contrib/systemd/mesh.service /tmp/$PKGNAME/etc/systemd/system/
 fi