diff --git a/syntax/Makefile.am b/syntax/Makefile.am
index d99dc3a..f2b3f39 100644
--- a/syntax/Makefile.am
+++ b/syntax/Makefile.am
@@ -1,6 +1,7 @@
 SYNTAXFILES =			\
 	Syntax			\
 	ada95.syntax		\
+	asm.syntax      \
 	aspx.syntax		\
 	assembler.syntax	\
 	c.syntax		\
diff --git a/syntax/Syntax b/syntax/Syntax
index 4f7dfed..2971b79 100644
--- a/syntax/Syntax
+++ b/syntax/Syntax
@@ -148,5 +148,8 @@ include idl.syntax
 file Don_t_match_me Mail\sfolder ^(From|Return-(P|p)ath:|From:|Date:)\s
 include mail.syntax
 
+file ..\*\\.(S|asm)$ Assembler\sSource
+include asm.syntax
+
 file .\* unknown
 include unknown.syntax
diff --git a/syntax/asm-syntax b/syntax/asm-syntax
new file mode 100644
index 0000000..2d729de
--- /dev/null
+++ b/syntax/asm.syntax
@@ -0,0 +1,20 @@
+#  ASM definition created by Michelle Konzack <linux4michelle@freenet.de>
+#  This definition is under the GNU GPL version 3.0.
+
+context default
+    keyword /\*				brown/22
+    keyword \*/				brown/22
+    keyword @*\n			green/22
+    keyword linestart +:		brightmagenta/22
+
+context exclusive /\* \*/		brown/22
+    spellcheck
+
+context linestart # \n			brightred/22
+    keyword <+>				red/22
+
+context linestart ENTRY(*) \n		brightgreen/22
+
+
+file ..\*\\.(S|asm)$ Assembler\sSource
+include asm.syntax