--- a/runtime/ftplugin/pascal.vim
+++ b/runtime/ftplugin/pascal.vim
@@ -1,14 +1,19 @@
 " Vim filetype plugin file
 " Language:	pascal
 " Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Changed: 20 Jan 2009
+" Last Changed: 11 Apr 2011
 " URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 if exists("loaded_matchit")
-    let b:match_words='\<\%(begin\|case\|try\)\>:\<end\>'
+    let b:match_ignorecase = 1 " (pascal is case-insensitive)
+
+    let b:match_words = '\<\%(begin\|case\|record\|object\|try\)\>'
+    let b:match_words .= ':\<^\s*\%(except\|finally\)\>:\<end\>'
+    let b:match_words .= ',\<repeat\>:\<until\>'
+    let b:match_words .= ',\<if\>:\<else\>'
 endif
 
 " Undo the stuff we changed.