diff --git a/ChangeLog b/ChangeLog
index 9e11e26f..2858533d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -356,6 +356,7 @@ CVS code -
 	- Add "cxx" and "hxx" to the list of extensions that the
 	  "c-file" regexes apply to, and add "warning" and "error" to
 	  them as well. (Mike Frysinger)
+	- Add regexes for assembler files. (Mike Frysinger)
 	- In the preprocessor directives regex string in the "c-file"
 	  regexes, cover more whitespace characters than just " " by
 	  using "[[:space:]]" instead. (Mike Frysinger)  DLR: Extend
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index f099648a..8e31adae 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -269,6 +269,22 @@
 # color brightwhite "\\f[BIPR]"
 # color yellow "\.(br|DS|RS|RE|PD)"
 
+## Here is an example for assembler
+##
+# syntax "asm-file" "\.(S|s|asm)$"
+# color red "\<[A-Z_]{2,}\>"
+# color brightgreen "\.(data|subsection|text)"
+# color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
+# color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
+# color brightred "^[[:space:]]*[._A-Za-z0-9]*:"
+# color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+## Highlight strings (note: VERY resource intensive)
+# color brightyellow "<[^=[[:space:]]]*>" ""(\\.|[^\"])*""
+# color brightyellow start=""(\\.|[^\"])*\\[[:space:]]*$" end="^(\\.|[^\"])*""
+## Highlight comments
+# color brightblue "//.*"
+# color brightblue start="/\*" end="\*/"
+
 ## Here is an example for your .nanorc
 ##
 # syntax "nanorc" "(\.|/|)nanorc$"