--- a/lisp/faces.el	Thu Mar 17 23:42:59 2011 +0100
+++ b/lisp/faces.el	Tue Mar 29 00:02:47 2011 +0200
@@ -1700,7 +1700,6 @@
 	   (type (plist-get props 'type))
 	   (class (plist-get props 'class))
 	   (background (plist-get props 'background))
-           (min-colors (plist-get props 'min-colors))
 	   (match t)
 	   (entries display)
 	   entry req options)
@@ -1713,7 +1712,9 @@
 		      (type       (memq type options))
 		      (class      (memq class options))
 		      (background (memq background options))
-		      (min-colors (>= (display-color-cells frame)
+		      ;; `display-color-cells' can return nil (eg, TTYs).
+		      ;; If so, assume monochrome.
+		      (min-colors (>= (or (display-color-cells frame) 2)
 				      (car options)))
 		      (t (warn "Unknown req `%S' with options `%S'"
 			       req options)