diff --git a/ChangeLog b/ChangeLog
index 037a1d9b..88bd4670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -473,6 +473,12 @@ CVS code -
 	- Simplify the extensions associated with the "nanorc" regexes.
 	  (DLR)
 	- Add regexes for Ruby. (John M. Gabriele, minor tweaks by DLR)
+- doc/nanorc.nanorc:
+	- Tweak the "nanorc" regexes to color comments starting with a
+	  double ## cyan instead of bright blue. (John M. Gabriele)
+- doc/sh.nanorc:
+	- Tweak the coloring of all special variables so that "-" is
+	  highlighted properly. (Benno Schulenberg)
 - src/Makefile.am:
 	- If we're uninstalling, remove the "rnano" symlink. (DLR, found
 	  by Benno Schulenberg)
diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index c534ad5e..f63d770d 100644
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -13,3 +13,4 @@ icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
 icolor white ""(\\.|[^"])*""
 ## Comments
 icolor brightblue "^[[:space:]]*#.*$"
+icolor cyan "^[[:space:]]*##.*$"
diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc
index fab9f11b..fd473ed0 100644
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -7,6 +7,6 @@ color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 color green "-[Ldefgruwx]\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
-icolor brightred "\$\{?[0-9A-Z_!@#$*-?]+\}?"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 color yellow "(^|[[:space:]])#.*$"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"