diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ad9d6e4d9b..d1e102b52da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
+
+	* custom.el (custom-push-theme): Fix last change.
+
 2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
 	* cus-theme.el (custom-theme-write-faces): Save the current face
diff --git a/lisp/custom.el b/lisp/custom.el
index 2b714a7b458..d634160e534 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -649,7 +649,8 @@ See `custom-known-themes' for a list of known themes."
 	(progn
 	  (setcar (cdr setting) mode)
 	  (setcar (cddr setting) value))
-      (if (null old)
+      (if (and (null old)
+	       (boundp symbol))
 	  (setq old
 		(list
 		 (list 'standard 'set