diff --git a/fax/faxq.in b/fax/faxq.in
index d9bf320..7dec97f 100644
--- a/fax/faxq.in
+++ b/fax/faxq.in
@@ -112,16 +112,16 @@ do
     if [ -z "$verbose" ]
     then
 	eval `tr -d '\042\047\140\134\044\073' <$i | \
-	     $AWK '$1=="user" { printf "USER=%s;", $2 }
-		   $1=="phone" { printf "PHONE=%s;", $2 }
+	     $AWK '$1=="user" { printf "USER=\"%s\";", $2 }
+		   $1=="phone" { printf "PHONE=\"%s\";", $2 }
 		   $1=="pages" { printf "PAGES=%d;", NF-1 }
 		   $1=="priority" { printf "PRI=\" pri=%s.\";", $2}' -`
 	$echo "$i: queued by $USER. $PAGES page(s) to $PHONE.$PRI"
     else
 	eval `tr -d '\042\047\140\134\044\073' <$i | \
-	     $AWK '$1=="user" { printf "USER=%s;", $2 }
+	     $AWK '$1=="user" { printf "USER=\"%s\";", $2 }
 		   $1=="mail"  { printf "MAILTO=\"%s\";", substr( $0, 6 ) }
-		   $1=="phone" { printf "PHONE=%s;", $2 }
+		   $1=="phone" { printf "PHONE=\"%s\";", $2 }
 		   $1=="verbose_to" \
 			       { printf "VERBTO=\"%s\";", substr( $0, 12 ) }
 		   $1=="acct_handle" \
diff --git a/fax/faxrunq.in b/fax/faxrunq.in
index 6c63954..57887dc 100644
--- a/fax/faxrunq.in
+++ b/fax/faxrunq.in
@@ -177,7 +177,7 @@ do
 	  $AWK 'BEGIN { user=""; mail=""; verbto=""; time=""; time_to=""; re=""; ah=""; }
 		$1=="user" { user=$2 }
 		$1=="mail" { mail=substr( $0, 6) }
-		$1=="phone" { printf "PHONE=%s;", $2 }
+		$1=="phone" { printf "PHONE=\"%s\";", $2 }
 		$1=="time" { time=substr($2,1,4); time_to=substr($2,6,4); }
 		$1=="verbose_to" { verbto=substr($0,12) }
 		$1=="subject" { re=substr($0,9) }
@@ -223,12 +223,12 @@ do
     command=`tr -d '\042\047\140\134\044\073' <JOB | \
              $AWK 'BEGIN { phone="-"; flags=""; pages="" }
 		  $1=="phone" { phone=$2 }
-		  $1=="header"     { flags=flags" -h "$2 }
+		  $1=="header"     { flags=flags" -h \""$2"\"" }
 		  $1=="poll"       { flags=flags" -p" }
 		  $1=="normal_res" { flags=flags" -n" }
 		  $1=="acct_handle" { flags=flags" -A \""substr($0,13)"\"" }
-		  $1=="pages" { for( i=2; i<=NF; i++) pages=pages$i" " }
-		  END { printf "'"$FAX_SENDER"' -v%s %s %s", \
+		  $1=="pages" { for( i=2; i<=NF; i++) pages=pages"\""$i"\" " }
+		  END { printf "'"$FAX_SENDER"' -v%s \"%s\" %s", \
 			       flags, phone, pages }' -`
 
 #