diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index e68c1746840b..d4ed8793dc44 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	9
+PATCHLEVEL=	14
 PORTVERSION=	6.1.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index d0adf8a10955..c6ef71c903f9 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -7,3 +7,8 @@ MD5 (vim/6.1.006) = a04a75f46459f82972be1a43a66cfb4b
 MD5 (vim/6.1.007) = f3c6157cce44cb8ad54c883a83448a42
 MD5 (vim/6.1.008) = 6f0cabc70c5f656905322d1231261aa2
 MD5 (vim/6.1.009) = 97c9f87b79ce41e9b620d572e5c298e4
+MD5 (vim/6.1.010) = 149335dce4bee14145c4f3d563d9a7f9
+MD5 (vim/6.1.011) = 7b2ce911d7f47bf4a1e0bc8de98b3e18
+MD5 (vim/6.1.012) = 242d3d264064af7eb798d609ce631e8a
+MD5 (vim/6.1.013) = 61558b5cd2c06d1bb286461588ed82ea
+MD5 (vim/6.1.014) = 9bb6eb1e884453390343e7d2a1ac6f7a
diff --git a/editors/vim/files/patch-osdef.sh b/editors/vim/files/patch-osdef.sh
new file mode 100644
index 000000000000..be9c7669aa66
--- /dev/null
+++ b/editors/vim/files/patch-osdef.sh
@@ -0,0 +1,26 @@
+*** osdef.sh.orig	Sun Jun 11 23:36:49 2000
+--- osdef.sh	Tue Apr  9 20:28:37 2002
+***************
+*** 47,56 ****
+  # start of the line is matched with "[)*, 	]\1[ 	(]"
+  sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
+  
+! sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	]\1[ 	(]/i\\\
+  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
+  
+! sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	]\1[ 	(]/i\\\
+  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
+  
+  cat << EOF > osdef2.sed
+--- 47,56 ----
+  # start of the line is matched with "[)*, 	]\1[ 	(]"
+  sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
+  
+! sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	][(]*\1[)]*[ 	(]/i\\\
+  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
+  
+! sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	][(]*\1[)]*[ 	(]/i\\\
+  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
+  
+  cat << EOF > osdef2.sed
+