diff --git a/build b/build
index 80a92d54..786e7db2 100755
--- a/build
+++ b/build
@@ -25,7 +25,7 @@ do
   o) ARGS="$ARGS -o $OPTARG";;
   p) ARGS="$ARGS -buildmode=pie";;
   # statically linked executable
-  s) LDFLAGS="$LDFLAGS -linkmode external -extldflags=-static";;
+  s) STATIC=" -linkmode external -extldflags=-static";;
   esac
 done
 
@@ -33,7 +33,18 @@ if [ -z $TABLES ] && [ -z $DEBUG ]; then
   LDFLAGS="$LDFLAGS -s -w"
 fi
 
-for CMD in ./cmd/mesh ./cmd/meshctl ./contrib/ui/mesh-ui ; do
+#could be static
+for CMD in ./cmd/mesh ./cmd/meshctl ; do
+  echo "Building: $CMD"
+  go build $ARGS -ldflags "${LDFLAGS}${STATIC}" -gcflags "$GCFLAGS" $CMD
+
+  if [ $UPX ]; then
+    upx --brute $CMD
+  fi
+done
+
+#dynamic only
+for CMD in ./contrib/ui/mesh-ui ; do
   echo "Building: $CMD"
   go build $ARGS -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" $CMD