diff --git a/misc/syntax/Makefile.am b/misc/syntax/Makefile.am
index 368d342f7..9b9f686cb 100644
--- a/misc/syntax/Makefile.am
+++ b/misc/syntax/Makefile.am
@@ -26,6 +26,7 @@ SYNTAXFILES =			\
 	haskell.syntax		\
 	html.syntax		\
 	idl.syntax		\
+	ini.syntax		\
 	j.syntax		\
 	java.syntax		\
 	js.syntax		\
diff --git a/misc/syntax/Syntax b/misc/syntax/Syntax
index 0d0c5a23f..d9dea5483 100644
--- a/misc/syntax/Syntax
+++ b/misc/syntax/Syntax
@@ -175,6 +175,9 @@ include lua.syntax
 file ..\*\\.([iI][dD][lL])$ CORBA\sIDL
 include idl.syntax
 
+file ..\*\\.([iI][nN][iI])$ INI\sFile
+include ini.syntax
+
 file Don_t_match_me Mail\sfolder ^(From|Return-(P|p)ath:|From:|Date:)\s
 include mail.syntax
 
diff --git a/misc/syntax/ini.syntax b/misc/syntax/ini.syntax
new file mode 100644
index 000000000..d6c79c30e
--- /dev/null
+++ b/misc/syntax/ini.syntax
@@ -0,0 +1,18 @@
+# DOS / Windows INI files
+
+context default cyan
+    keyword = brightred
+
+# groups
+context [ ] yellow
+
+# comments:
+context # \n brown
+    spellcheck
+
+context ; \n brown
+    spellcheck
+
+context exclusive = \n brightcyan
+
+