diff --git a/ChangeLog b/ChangeLog
index 0f370796..f89845dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-23  Mike Frysinger  <vapier@gentoo.org>
+	* doc/syntax/autoconf.nanorc: Handle .m4 files too, add the "elif"
+	keyword, handle dnl comments better, and mark trailing whitespace.
+
 2015-12-23  Christian Weisgerber  <naddy@mips.inka.de>
 	* configure.ac: AC_CHECK_HEADERS_ONCE() is very special and cannot be
 	conditionalized.  Use plain AC_CHECK_HEADERS() instead, to not check
diff --git a/doc/syntax/autoconf.nanorc b/doc/syntax/autoconf.nanorc
index 5760c3cd..58a9b072 100644
--- a/doc/syntax/autoconf.nanorc
+++ b/doc/syntax/autoconf.nanorc
@@ -1,9 +1,9 @@
 ## Here is an example for Autoconf.
 
-syntax "autoconf" "\.ac$"
+syntax "autoconf" "\.(ac|m4)$"
 
 # Keywords:
-color yellow "\<(if|test|then|else|fi|for|in|do|done)\>"
+color yellow "\<(if|test|then|elif|else|fi|for|in|do|done)\>"
 color yellow "(=|!=|&&|\|\|)"
 
 # Macros:
@@ -25,4 +25,7 @@ color black "^\*\*\*.*"
 color magenta "\[|\]|\(|\)"
 
 # Comments:
-color blue "^[[:blank:]]*#.*"  "^dnl.*"
+color blue "^[[:blank:]]*#.*"  "\<dnl.*"
+
+# Trailing whitespace:
+color ,green "[[:space:]]+$"