diff --git a/ChangeLog b/ChangeLog
index 0df0c6d2..5fd3f9a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,7 @@ CVS code -
 	  by DLR, suggested by John M. Gabriele)
 	- Explicitly mention that all regexes should be extended regular
 	  expressions. (DLR, suggested by John M. Gabriele)
+	- Simplify the "nanorc" regex for commands. (DLR)
 - UPGRADE:
 	- Miscellaneous minor fixes. (DLR)
 
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index 871ae143..d4c748b3 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -356,7 +356,7 @@
 ##
 # syntax "nanorc" "(\.|/|)nanorc$"
 ## highlight possible errors and parameters
-# icolor brightwhite "^[[:space:]]*(set|unset|include|syntax|i?color).*$"
+# icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
 ## set, unset and syntax
 # 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 green "^[[:space:]]*(set|unset|syntax)\>"