diff --git a/ChangeLog b/ChangeLog
index 8b2a8231..7cb829c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* doc/syntax/gentoo.nanorc - Update to newer EAPIs, and fold
 	in updated shell changes too.  Much of this is based on work
 	by Davide Pesavento <pesa@gentoo.org>.
+	* doc/syntax/makefile.nanorc: Highlight trailing whitespace.
 
 2014-02-26  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (shortcut_init) -  Put PageUp and PageDown
diff --git a/doc/syntax/makefile.nanorc b/doc/syntax/makefile.nanorc
index bac672ac..f81d1e5a 100644
--- a/doc/syntax/makefile.nanorc
+++ b/doc/syntax/makefile.nanorc
@@ -7,3 +7,5 @@ color magenta "\<(if|ifeq|else|endif)\>"
 color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
 color brightblue "^[^ 	]+:"
 color green "#.*$"
+## Trailing whitespace.
+color ,green "[[:space:]]+$"