diff --git a/runtime/ftplugin/mp.vim b/runtime/ftplugin/mp.vim
index 3709782..316fa9b 100644
--- a/runtime/ftplugin/mp.vim
+++ b/runtime/ftplugin/mp.vim
@@ -1,13 +1,16 @@
 " Vim filetype plugin file
 " Language:         MetaPost
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-07-04
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=croql
@@ -20,3 +23,6 @@
     g/^beginfig(\d*);$/s//\='beginfig('.i.');'/ | let i = i + 1
   endfunction
 endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save