diff --git a/ChangeLog b/ChangeLog
index 670bbf413c80378bab28cc5aeeac7b146d6a8af8..7ba7b42c39004409c49269c185e614e3d109c02b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -340,6 +340,9 @@ CVS code -
 	- Replace instances of "\w" with its equivalent "[0-9A-Za-z_]",
 	  and instances of "\W" with its equivalent "[^0-9A-Za-z_]", for
 	  greater readability. (DLR)
+	- Remove unneeded foreground color for the Java source regex
+	  used to highlight trailing whitespace, since we now support
+	  background colors without foreground colors. (DLR)
 - src/Makefile.am:
 	- If we're uninstalling, remove the "rnano" symlink. (DLR, found
 	  by Benno Schulenberg)
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index 76c36c7cbf0bc065232beb61ab03f52a9cbea564..12f41a00089256c842583a5564b91f065c41e9d8 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -307,7 +307,7 @@
 # color blue "//.*"
 # color blue start="/\*" end="\*/"
 # color brightblue start="/\*\*" end="\*/"
-# color brightgreen,green "[[:space:]]+$"
+# color ,green "[[:space:]]+$"
 
 ## Here is an example for patch files.
 ##