diff --git a/ChangeLog b/ChangeLog
index 131a8c5e088ba5bdc1871523d6960e52664366a9..0abe3f9eb0421c776c30558c3c2bf7f18bdefa7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -447,8 +447,9 @@ CVS code -
 	- Further simplify the "groff" regexes. (DLR)
 	- Tweak the "shellscript" regexes to properly color all special
 	  variables, such as $? and $@. (Benno Schulenberg)
-	- Tweak the "nanorc" regexes to color comments bright blue
-	  instead of blue. (John M. Gabriele)
+	- Tweak the "nanorc" regexes to color keywords bright green
+	  instead of cyan, and comments bright blue instead of blue.
+	  (John M. Gabriele)
 	- Simplify the extensions associated with the "nanorc" regexes.
 	  (DLR)
 - src/Makefile.am:
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index e3fb0eb5ceb7d7a9a943d0cb466df7b283dec102..3ee572f6b1ba6461b7bbb9ff63cd179f83cbe0c7 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -370,7 +370,7 @@
 ## Possible errors and parameters
 # icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
 ## Keywords
-# icolor cyan "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
+# icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
 # icolor green "^[[:space:]]*(set|unset|include|syntax)\>"
 ## Colors
 # icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"