diff --git a/ChangeLog b/ChangeLog
index e826007d1bf7cc3b79a8248d523beae1af00eef8..89d3745b519bcf6941dd6d656d2f137849f3e015 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ CVS code
 	- Add initialization file comments, change some options from 
 	  bracketed to underlined to emphasize that they are not 
 	  optional.
+- nanorc.sample:
+	- Make nanorc entry less tolerant of invalid colors.
 
 GNU nano 1.1.99pre2 - 2003.02.03
 - General:
diff --git a/nanorc.sample b/nanorc.sample
index 009bbaebeff981e8fb0f7c199bce5991d6b607f1..d29b29cf2ed6dc85ab123bc42072340d83582cbb 100644
--- a/nanorc.sample
+++ b/nanorc.sample
@@ -172,6 +172,6 @@
 #color brightwhite "^ *syntax [^ ]*"
 #color brightblue "^ *set\>" "^ *unset\>" "^ *syntax\>"
 #color white "^ *color\>.*"
-#color yellow "^ *color [^ ]*"
+#color yellow "^ *color (bright)?(white|black|red|blue|green|yellow|magenta|cyan)\>"
 #color magenta "^ *color\>"
 #color green "^#.*$"