diff --git a/ChangeLog b/ChangeLog
index 252b5bd..bf41fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-12  Glynn Foster  <glynn.foster@sun.com>
+
+	* src/gdialog.in: Make sure the gdialog wrapper 
+	handles spaces. Patch from Peter Åstrand 
+	<astrand@lysator.liu.se>
+
 2003-10-29  Glynn Foster  <glynn.foster@sun.com>
 
 	* src/zenity.glade: Unmark translation messages,
diff --git a/src/gdialog.in b/src/gdialog.in
index ff47010..b204532 100755
--- a/src/gdialog.in
+++ b/src/gdialog.in
@@ -227,7 +227,7 @@ ARG: while ($argn < $args) {
 		# an untitled column for the check or radio buttons
 		# and the 'text' arg as a second column header
 		
-		$command .= "--list $list --column='' --column $element ";
+		$command .= "--list $list --column='' --column \"$element\" ";
 		
 		# should output be line by line?
 		if ($separator) {
@@ -248,7 +248,7 @@ ARG: while ($argn < $args) {
 		
 		while ($argn < $args) {
 			get_arg;
-			$command .= "NULL $element ";
+			$command .= "NULL \"$element\" ";
 			$argn += 3;
 		}
 		last ARG;