diff --git a/ChangeLog b/ChangeLog
index 9023a2ff4bcba39b2bb4bfb5ac2d4be5c471719f..e132e78f8644eeb7ee91941f9600eb3d57be420e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,8 +94,8 @@ CVS code -
 - nanorc.sample:
 	- Remove duplicate "historylog" entry, remove "keypad" entry,
 	  and add "rebinddelete" entry. (DLR)
-	- Update the regexes for nanorc files. (Brand Huntsman, slightly
-	  modified by DLR)
+	- Update and add comments to the regexes for nanorc files.
+	  (Brand Huntsman)
 	- Fix an attempt at a bright background color in the sample Java
 	  source regexes. (DLR)
 	- Since tabs are shown as groups of spaces, they are interpreted
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index 8e80bf71da79623d894f5049041fb419d0195f43..a1fdf61c350b334e8759a9cc5a5bea36ea3524a5 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -197,11 +197,16 @@
 
 ## Here is an example for your .nanorc
 ##
-# syntax "nanorc" "(\.)?nanorc$"
-# color brightwhite "^ *(set|unset|syntax|color).*$"
-# color cyan "^ *(set|unset) +(autoindent|backup|const|cut|fill|historylog|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|rebinddelete|regexp|smooth|speller|suspend|tabsize|tempfile|view)"
-# color green "^ *(set|unset|syntax)\>"
-# color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
-# color magenta "^ *color\>" "\<(start|end)="
-# color white "\"(\\.|[^\"])*\""
-# color blue "^ *#.*$"
+#syntax "nanorc" "(\.|/|)nanorc$"
+## highlight possible errors and parameters
+#color brightwhite "^ *(set|unset|syntax|color).*$"
+## set, unset and syntax
+#color cyan "^ *(set|unset) +(autoindent|backup|const|cut|fill|historylog|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|rebinddelete|regexp|smooth|speller|suspend|tabsize|tempfile|view)"
+#color green "^ *(set|unset|syntax)\>"
+## colors
+#color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+#color magenta "^ *color\>" "\<(start|end)="
+## strings
+#color white "\"(\\.|[^\"])*\""
+## comments
+#color blue "^ *#.*$"