diff --git a/ChangeLog b/ChangeLog
index 431290e53d33153ac0cc8be4b94e74e43f1daa57..16ca8c75b246a3794bb42bd4cbfb638b75a35497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 CVS code -
+- doc/syntax/c.nanorc:
+	- Simplify "undef", "ifn?def", "elif", and "else" in the
+	  preprocessor regexes. (DLR)
 
 GNU nano 1.9.99pre2 - 2006.10.02
 - General:
diff --git a/doc/syntax/c.nanorc b/doc/syntax/c.nanorc
index 3980aed950fe5871e608dce362ad32168abc0866..cc0482cebe257b8b9f25d30d333bf5fdef178c01 100644
--- a/doc/syntax/c.nanorc
+++ b/doc/syntax/c.nanorc
@@ -8,7 +8,7 @@ color green "\<(class|namespace|template|public|protected|private|typename|this|
 color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
 color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
 color magenta "\<(goto|continue|break|return)\>"
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
 color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 ##
 ## GCC builtins