diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c5a98a4c4b..1275ba569e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-17  David Kastrup  <dak@gnu.org>
+
+	* cus-theme.el (custom-theme-write-variables): Quote variables
+	where necessary.
+
 2005-04-17  Richard M. Stallman  <rms@gnu.org>
 
 	* jka-compr.el (jka-compr-compression-info-list): Fix custom type.
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index f1001990d3c..41240303037 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -119,7 +119,7 @@ It includes all variables in list VARS."
 		(princ " '(")
 		(prin1 symbol)
 		(princ " ")
-		(prin1 (symbol-value symbol))
+		(prin1 (custom-quote (symbol-value symbol)))
 		(princ ")")))
 	      vars)
       (if (bolp)