diff --git a/runtime/ftplugin/modula2.vim b/runtime/ftplugin/modula2.vim
index 1d0e81e..e230636 100644
--- a/runtime/ftplugin/modula2.vim
+++ b/runtime/ftplugin/modula2.vim
@@ -11,28 +11,39 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal comments=s0:(*,mb:\ ,ex:*)
-setlocal commentstring=(*%s*)
+let s:dialect = modula2#GetDialect()
+
+if s:dialect ==# "r10"
+  setlocal comments=s:(*,m:\ ,e:*),:!
+  setlocal commentstring=!\ %s
+else
+  setlocal commentstring=(*%s*)
+  setlocal comments=s:(*,m:\ ,e:*)
+endif
 setlocal formatoptions-=t formatoptions+=croql
 
+let b:undo_ftplugin = "setl com< cms< fo<"
+
 if exists("loaded_matchit") && !exists("b:match_words")
-  " The second branch of the middle pattern is intended to match CASE labels
+  let b:match_ignorecase = 0
+  " the second branch of the middle pattern is intended to match CASE labels
   let b:match_words = '\<REPEAT\>:\<UNTIL\>,' ..
-		    \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOOP\|WHILE\|WITH\)\>' ..
-		    \	':' ..
-		    \	'\<\%(ELSIF\|ELSE\)\>\|\%(^\s*\)\@<=\w\+\%(\s*\,\s*\w\+\)\=\s*\:=\@!' ..
-		    \	':' ..
-		    \ '\<END\>'
+	\	      '\<\%(BEGIN\|CASE\|FOR\|IF\|LOOP\|WHILE\|WITH\|RECORD\)\>' ..
+	\		':' ..
+	\		'\<\%(ELSIF\|ELSE\)\>\|\%(^\s*\)\@<=\w\+\%(\s*\,\s*\w\+\)\=\s*\:=\@!' ..
+	\		':' ..
+	\	      '\<END\>,' ..
+	\	      '(\*:\*),<\*:\*>'
+  let b:match_skip = 's:Comment\|Pragma'
+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_skip b:match_words"
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Modula-2 Source Files (*.def *.mod)\t*.def;*.mod\n" ..
-		     \ "All Files (*.*)\t*.*\n"
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-let b:undo_ftplugin = "setl com< cms< fo< " ..
-		    \ "| unlet! b:browsefilter b:match_words"
-
 let &cpo = s:cpo_save
 unlet s:cpo_save