diff --git a/ChangeLog b/ChangeLog
index 17d8ccb3..2b834889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-11  Mike Frysinger  <vapier@gentoo.org>
+
+	* doc/syntax/asm.nanorc, doc/syntax/c.nanorc,
+	doc/syntax/sh.nanorc: Copy the regex that highlights trailing
+	whitespace from doc/syntax/java.nanorc to these files, as it's
+	also useful in them.  (With minor tweaks by DLR.)
+
 2007-04-04  David Lawrence Ramsey  <pooka109@gmail.com>
 
 	* AUTHORS, faq.html: Update email address.
diff --git a/doc/syntax/asm.nanorc b/doc/syntax/asm.nanorc
index 7668ffee..e94ee906 100644
--- a/doc/syntax/asm.nanorc
+++ b/doc/syntax/asm.nanorc
@@ -13,3 +13,5 @@ color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 ## Highlight comments
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
+## Highlight trailing whitespace
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/c.nanorc b/doc/syntax/c.nanorc
index cc0482ce..45da48b7 100644
--- a/doc/syntax/c.nanorc
+++ b/doc/syntax/c.nanorc
@@ -25,3 +25,6 @@ color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 ## Comment highlighting
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc
index 097f4852..f540f1b7 100644
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -10,3 +10,4 @@ color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|m
 icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 color cyan "(^|[[:space:]])#.*$"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color ,green "[[:space:]]+$"