diff --git a/runtime/ftplugin/passwd.vim b/runtime/ftplugin/passwd.vim
index 20f2b7f..5088c43 100644
--- a/runtime/ftplugin/passwd.vim
+++ b/runtime/ftplugin/passwd.vim
@@ -1,13 +1,19 @@
 " Vim filetype plugin file
 " Language:         passwd(5) password file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" 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= formatoptions-=tcroq formatoptions+=l
+
+let &cpo = s:cpo_save
+unlet s:cpo_save