diff --git a/runtime/ftplugin/masm.vim b/runtime/ftplugin/masm.vim
index 235469a..ab196eb 100644
--- a/runtime/ftplugin/masm.vim
+++ b/runtime/ftplugin/masm.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Microsoft Macro Assembler (80x86)
 " Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
-" Last Change:	2020-05-09 23:02:05 +0800
+" Last Change:	2022-04-24 21:24:52 +0800
 
 if exists("b:did_ftplugin")
   finish
@@ -15,5 +15,18 @@
 
 setlocal iskeyword=@,48-57,_,36,60,62,63,@-@
 
+" Matchit support
+if !exists('b:match_words')
+  let b:match_words = '^\s*\.IF\>:^\s*\.ELSEIF\>:^\s*\.ELSE\>:^\s*\.ENDIF\>,'
+        \ .. '^\s*\.REPEAT\>:^\s*\.UNTIL\(CXZ\)\?\>,'
+        \ .. '^\s*\.WHILE\>:^\s*\.ENDW\>,'
+        \ .. '^\s*IF\(1\|2\|E\|DEF\|NDEF\|B\|NB\|IDNI\?\|DIFI\?\)\?\>:^\s*ELSEIF\(1\|2\|E\|DEF\|NDEF\|B\|NB\|IDNI\?\|DIFI\?\)\?\>:^\s*ELSE\>:^\s*ENDIF\>,'
+        \ .. '\(\<MACRO\>\|^\s*%\?\s*FORC\?\>\|^\s*REPEAT\>\|^\s*WHILE\):^\s*ENDM\>,'
+        \ .. '\<PROC\>:\<ENDP\>,'
+        \ .. '\<SEGMENT\>:\<ENDS\>'
+  let b:match_ignorecase = 1
+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words"
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save