diff --git a/build.sh b/build.sh
index 67648d3..748ec9e 100755
--- a/build.sh
+++ b/build.sh
@@ -32,4 +32,10 @@ gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(a
 gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
 )
 
-circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 --package_folder_prefix "$P"
+if [ -z "$P" ]; then
+  P=""
+else
+  P="--package_folder_prefix $P"
+fi
+
+circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 "$P"