diff --git a/ChangeLog b/ChangeLog
index 5f2dbca73ca6bccc8d663724f43841923749c882..4792aae6012b4128320734b04a59f43c483bd320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	  first in an effort to not corrupt the screen, which contradicts Pico but is consistent
 	  with almost all other text editors.  Fixes Savannah bug 28110/Debian bug 460510
 	  reported by Tim Connors <reportbug@rather.puzzling.org>.
+	* doc/dyntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version.
 
 2009-11-26 Chris Allegretta <chrisa@asty.org>
 	* winio.c (edit_scroll): Adjust for long lines when scrolling.
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index dcb46d941e957f6bfbf3aed4ab9cefa811893082..4d5a01d1e4969a3eb81692b609902029d3ac0c07 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -238,6 +238,9 @@
 ## C/C++
 # include "@PKGDATADIR@/c.nanorc"
 
+## Makefiles
+# include "@PKGDATADIR@/makefile.nanorc"
+
 ## Cascading Style Sheets
 # include "@PKGDATADIR@/css.nanorc"
 
diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am
index 828bd7bb6c6ab9e821612a0b8701d44e33f355ba..9566a182a31328edf36238f55f7b148bcae0e360 100644
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -22,6 +22,7 @@ pkgdata_DATA =	asm.nanorc \
 		xml.nanorc \
 		ocaml.nanorc \
 		objc.nanorc \
-		fortran.nanorc
+		fortran.nanorc \
+		makefile.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/doc/syntax/makefile.nanorc b/doc/syntax/makefile.nanorc
new file mode 100644
index 0000000000000000000000000000000000000000..7b639dde5f2469550c66eefd948e892ae505cf55
--- /dev/null
+++ b/doc/syntax/makefile.nanorc
@@ -0,0 +1,8 @@
+# unattributed syntax highlighting example from wiki.linuxhelp.net/
+
+syntax "makefile" "Makefile[^/]*$"
+color red "[:=]"
+color magenta "\<(if|ifeq|else|endif)\>"
+color blue "\$+[{(][a-Z0-9_-]+[})]"
+color brightblue "^[^ 	]+:"
+color green "#.*$"