diff --git a/debian/scripts/koha-generate-env b/debian/scripts/koha-generate-env
index 0af2a86a49..6b908afb49 100755
--- a/debian/scripts/koha-generate-env
+++ b/debian/scripts/koha-generate-env
@@ -52,7 +52,7 @@ case "$SERVICE" in
 PLACK_WORKERS=${WORKERS:-2}
 PLACK_MAX_REQUESTS=${MAX_REQUESTS:-50}
 PLACK_ENVIRONMENT=${ENVIRONMENT}
-PLACK_PSGIFILE=${PSGIFILE}
+PLACK_PSGIFILE="${PSGIFILE}"
 EOF
         ;;
 
@@ -104,8 +104,8 @@ EOF
         fi
 
         cat > "$ENVFILE" <<EOF
-Z3950_CONFIGDIR=${CONFIGDIR}
-Z3950_ADDITIONAL_OPTS=${Z3950_OPTS}
+Z3950_CONFIGDIR="${CONFIGDIR}"
+Z3950_ADDITIONAL_OPTS="${Z3950_OPTS}"
 EOF
         ;;
 esac