diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71c7eedb335..d0f08795ed3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* faces.el (face-spec-set-match-display): Don't match toolkit
+	options on terminal frames.
+
 2011-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/pascal.el: Use lexical binding.
diff --git a/lisp/faces.el b/lisp/faces.el
index e7cfa200602..3fb8bc80931 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1451,18 +1451,18 @@ If FRAME is nil, the current FRAME is used."
 			     ;; of supported colors, and all defface's
 			     ;; are changed to look at number of colors
 			     ;; instead of (type graphic) etc.
-			     (and (null (window-system frame))
-				  (memq 'tty options))
-			     (and (memq 'motif options)
-				  (featurep 'motif))
-			     (and (memq 'gtk options)
-				  (featurep 'gtk))
-			     (and (memq 'lucid options)
-				  (featurep 'x-toolkit)
-				  (not (featurep 'motif))
-				  (not (featurep 'gtk)))
-			     (and (memq 'x-toolkit options)
-				  (featurep 'x-toolkit))))
+			     (if (null (window-system frame))
+				 (memq 'tty options)
+			       (or (and (memq 'motif options)
+					(featurep 'motif))
+				   (and (memq 'gtk options)
+					(featurep 'gtk))
+				   (and (memq 'lucid options)
+					(featurep 'x-toolkit)
+					(not (featurep 'motif))
+					(not (featurep 'gtk)))
+				   (and (memq 'x-toolkit options)
+					(featurep 'x-toolkit))))))
 			((eq req 'min-colors)
 			 (>= (display-color-cells frame) (car options)))
 			((eq req 'class)