diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31f5ff2f76a..b1e2ba0f8ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-07  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
+
+	* cus-face.el (custom-theme-set-faces): Set face attributes
+	locally for each frame.
+
 2007-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/fortran.el (fortran-mode): Set font-lock-syntactic-keywords
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 900a815b160..09cf058dc64 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -342,7 +342,8 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
 		(unless (facep face)
 		  (make-empty-face face))
 		(put face 'face-comment comment)
-		(face-spec-set face spec))
+		(dolist (frame (frame-list))
+		  (face-spec-set face spec frame)))
 	    (setq args (cdr args)))
 	;; Old format, a plist of FACE SPEC pairs.
 	(let ((face (nth 0 args))