diff --git a/ChangeLog b/ChangeLog
index 3ea49514bb42bb1d673299a0f74fc9544408d0d6..3f8e00d48d37ea315285ccb47995d232f4bad50d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2011-05-08 Chris Allegretta <chrisa@asty.org>
+	* doc/syntax/Makefile.am: Finally get around to sorting the syntax file list
+
+2011-05-08 Matthew Wild <mattj100@Savannah>
+	* doc/syntax/spec.nanorc: New lua syntax highlighting config
+
 2011-03-28 Asterios Dramis <asterios.dramis@gmail.com>
-	* doc/syntax/spec.nanorc: New RPM spec file highlighting file 
+	* doc/syntax/spec.nanorc: New RPM spec file highlighting config
 
 2011-03-12 Chris Allegretta <chrisa@asty.org>
 	* po/*: Sync latest translation fixes, add an update_linguas.sh script.  Rename
diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am
index 4d52039ca0b2ec9eb7d03ed482407243fdcca87d..13bf619442be13e47638dc8a7ba62f0a6a6dcc2c 100644
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -1,31 +1,32 @@
 pkgdata_DATA =	asm.nanorc \
-		c.nanorc \
+		awk.nanorc \
 		cmake.nanorc \
+		c.nanorc \
+		css.nanorc \
+		debian.nanorc \
+		fortran.nanorc \
+		gentoo.nanorc \
 		groff.nanorc \
 		html.nanorc \
 		java.nanorc \
+		lua.nanorc \
+		makefile.nanorc \
 		man.nanorc \
+		mgp.nanorc \
 		mutt.nanorc \
 		nanorc.nanorc \
+		objc.nanorc \
+		ocaml.nanorc \
 		patch.nanorc \
 		perl.nanorc \
+		php.nanorc \
 		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		sh.nanorc \
-		tex.nanorc \
+		spec.nanorc \
 		tcl.nanorc \
-		php.nanorc \
-		gentoo.nanorc \
-		debian.nanorc \
-		awk.nanorc \
-		css.nanorc \
-		xml.nanorc \
-		ocaml.nanorc \
-		objc.nanorc \
-		fortran.nanorc \
-		makefile.nanorc \
-		mgp.nanorc \
-		spec.nanorc
+		tex.nanorc \
+		xml.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/doc/syntax/lua.nanorc b/doc/syntax/lua.nanorc
new file mode 100644
index 0000000000000000000000000000000000000000..af9d1402ecb4b529c3bcb030c82b197900d834a5
--- /dev/null
+++ b/doc/syntax/lua.nanorc
@@ -0,0 +1,76 @@
+##############################################################################
+#
+# Lua syntax highlighting for Nano.
+#
+# Author:  Matthew Wild <mwild1 (at) gmail.com>
+# License: GPL 3 or later
+#
+# Version: 2011-05-05
+#
+# Notes: Originally based on Ruby syntax rc by Josef 'Jupp' Schugt
+##############################################################################
+
+
+# Automatically use for '.lua' files
+syntax "lua" "\.lua$"
+
+color brightwhite "\[\[.*\]\]"
+
+# Operators
+color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|\<(not|and|or)\>"
+
+# Statements
+color brightblue "\<(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return|break)\>"
+
+# Keywords
+color brightyellow "\<(debug|string|math|table|io|coroutine|os)\>\."
+color brightyellow "\<(_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\s*\("
+
+# Standard library
+color brightyellow "io\.\<(close|flush|input|lines|open|output|popen|read|tmpfile|type|write|stdin|stdout|stderr)\>"
+color brightyellow "math\.\<(abs|acos|asin|atan2|atan|ceil|cosh|cos|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log|max|min|mod|modf|pi|pow|rad|random|randomseed|sinh|tan)\>"
+color brightyellow "os\.\<(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)\>"
+color brightyellow "package\.\<(cpath|loaded|loadlib|path|preload|seeall)\>"
+color brightyellow "string\.\<(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)\>"
+color brightyellow "table\.\<(concat|insert|maxn|remove|sort)\>"
+color brightyellow "coroutine\.\<(create|resume|running|status|wrap|yield)\>"
+color brightyellow "debug\.\<(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue|setfenv|sethook|setlocal|setmetatable|setupvalue|traceback)\>"
+
+# File handle methods
+color brightyellow "\:\<(close|flush|lines|read|seek|setvbuf|write)\>"
+
+# false, nil, true
+color brightmagenta "\<(false|nil|true)\>"
+
+# External files
+color brightgreen "\<(dofile|require)\>"
+
+# Numbers
+color red "\<([0-9]+)\>"
+
+# Symbols
+color brightmagenta "(\(|\)|\[|\]|\{|\})"
+
+
+# Shebang
+color brightcyan   "^#!.*"
+
+# Simple comments
+color green        "\-\-.*$"
+
+# Multiline comments
+color green         start="\-\-\[\[" end="\]\]"
+
+# Strings
+#color green "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
+
+# Strings
+color red "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
+
+# color red         start="\[\[" end="\]\]"
+
+
+# Hex literals
+color red "0x[0-9a-fA-F]*"
+
+