diff --git a/ChangeLog b/ChangeLog
index 6df1cf97ef951ad316f57ec3189e87d9ede932af..f4991b3298d2c9fba224705e512a4eedc56fc337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-11-22 Mike Frysinger <vapier@gentoo.org>
+	* doc/syntax/gentoo.nanorc: Tweak comment highlighting.
+
 GNU nano 2.1.99pre2 - 2009.11.21
 2009-11-21 Chris Allegretta <chrisa@asty.org>
 	* rcfile.c: Add unbinding keyword, fixes Savannah bug 22852 reported by frankd.
diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc
index 319b81bec426c80d38266731810d8b5bc54c97fd..2ad159714c63a8529d3e655778b4873a87dd3bc8 100644
--- a/doc/syntax/gentoo.nanorc
+++ b/doc/syntax/gentoo.nanorc
@@ -27,7 +27,7 @@ color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|
 ## Highlight common commands used in ebuilds
 color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
 ## Highlight comments (doesnt work that well)
-color yellow "#.*$"
+color yellow "(^|[[:space:]])#.*$"
 ## Highlight strings (doesnt work that well)
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!