diff --git a/build.sh b/build.sh
index ff745b1..a318b96 100755
--- a/build.sh
+++ b/build.sh
@@ -73,17 +73,17 @@ else
 fi
 
 echo "Generate debian changelog using gitdch..."
-GITDCH_ARGS='--verbose'
-[ -n "$QUIET_ARG" ] && GITDCH_ARGS='--warning'
+GITDCH_ARGS=('--verbose')
+[ -n "$QUIET_ARG" ] && GITDCH_ARGS=('--warning')
 if [ -n "$MAINTAINER_NAME" ]
 then
 	echo "Use maintainer name from environment ($MAINTAINER_NAME)"
-	GITDCH_ARGS="$GITDCH_ARGS --maintainer-name '$MAINTAINER_NAME'"
+	GITDCH_ARGS+=("--maintainer-name" "${MAINTAINER_NAME}")
 fi
 if [ -n "$MAINTAINER_EMAIL" ]
 then
 	echo "Use maintainer email from environment ($MAINTAINER_EMAIL)"
-	GITDCH_ARGS="$GITDCH_ARGS --maintainer-email '$MAINTAINER_EMAIL'"
+	GITDCH_ARGS+=("--maintainer-email" "$MAINTAINER_EMAIL")
 fi
 $GITDCH \
 	--package-name mylib \
@@ -91,7 +91,7 @@ $GITDCH \
 	--code-name $DEBIAN_CODENAME \
 	--output debian/changelog \
 	--path ../../ \
-	$GITDCH_ARGS
+	"${GITDCH_ARGS[@]}"
 
 echo "Add custom package name for dependencies..."
 cat << EOF > debian/py3dist-overrides