diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index e25d10dd9373..e392264f84af 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	16
+PATCHLEVEL=	45
 PORTVERSION=	6.3.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
@@ -18,7 +18,7 @@ PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|}
 PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
-BADPATCHES=	000
+BADPATCHES=	000 022 025 035 038 041 044
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N6.3.${p}}
 .endfor
@@ -180,6 +180,8 @@ cklatest:
 		| fgrep ${PORTVERSION:C/[0-9]*$//} | ${TAIL}
 
 find-bad-patches:
-	egrep -l '(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32)' *
+	cd ${DISTDIR} ; egrep -l \
+		'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_riscos)'\
+		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
 
 .include <bsd.port.post.mk>
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 59ed21d814dd..b9c68dd2ac7c 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -32,3 +32,49 @@ MD5 (vim/6.3.015) = 2864855cb6cb0d3048cc8e74b16a5990
 SIZE (vim/6.3.015) = 1207
 MD5 (vim/6.3.016) = 2f58e8b00f4614c2b071838d299310b6
 SIZE (vim/6.3.016) = 1735
+MD5 (vim/6.3.017) = 821323cc5cdefbc69899e6bc8b30bc30
+SIZE (vim/6.3.017) = 1364
+MD5 (vim/6.3.018) = 735e869f92d6c80c6d43c837dee670b3
+SIZE (vim/6.3.018) = 1844
+MD5 (vim/6.3.019) = f6885686d11cd7f794805a70ee849579
+SIZE (vim/6.3.019) = 1992
+MD5 (vim/6.3.020) = e51adda32a4a1a73dff2e92b3715b1ef
+SIZE (vim/6.3.020) = 1915
+MD5 (vim/6.3.021) = 559410e68495eed2fd05e65533b03aa8
+SIZE (vim/6.3.021) = 2822
+MD5 (vim/6.3.023) = 2f460f5691c31d14354f5ca20536b6f1
+SIZE (vim/6.3.023) = 6419
+MD5 (vim/6.3.024) = e3e1f86a74242731d93a009cb692f952
+SIZE (vim/6.3.024) = 2456
+MD5 (vim/6.3.026) = 30c225d5ee55b073eec23037969edb48
+SIZE (vim/6.3.026) = 3070
+MD5 (vim/6.3.027) = c6f122ba3c95d03f835842d05d66c3bd
+SIZE (vim/6.3.027) = 7500
+MD5 (vim/6.3.028) = 11c22371c8ca2e3588f894bba8c5409f
+SIZE (vim/6.3.028) = 2128
+MD5 (vim/6.3.029) = 7a3493a75ee1ae8277ac2d824b356758
+SIZE (vim/6.3.029) = 2173
+MD5 (vim/6.3.030) = f1a101fcc7474f68189fbfb08d73fd52
+SIZE (vim/6.3.030) = 4579
+MD5 (vim/6.3.031) = 69ce6ad1dbcb5df6579764bb1975153b
+SIZE (vim/6.3.031) = 1483
+MD5 (vim/6.3.032) = b0004e79c5fb690dca71822c1e9051fc
+SIZE (vim/6.3.032) = 2094
+MD5 (vim/6.3.033) = 2e4a5a94cbc17ca42535f0702f103743
+SIZE (vim/6.3.033) = 1552
+MD5 (vim/6.3.034) = ceae20562137686b028bb03f8bdc1276
+SIZE (vim/6.3.034) = 1618
+MD5 (vim/6.3.036) = 162c46080fc0a858917ea63d156154de
+SIZE (vim/6.3.036) = 1770
+MD5 (vim/6.3.037) = b595c4f9d9638e9d715d0dec09089b16
+SIZE (vim/6.3.037) = 2889
+MD5 (vim/6.3.039) = 6de3ea5c394d55504fc846a7e2e54968
+SIZE (vim/6.3.039) = 2749
+MD5 (vim/6.3.040) = 26f4b0e018ceb5d4a8298989e5a57dc0
+SIZE (vim/6.3.040) = 18020
+MD5 (vim/6.3.042) = 4a8bc79b06357416164bfc77b16e3b40
+SIZE (vim/6.3.042) = 1760
+MD5 (vim/6.3.043) = 54352b78dae65bdd0cac2471c257b5f1
+SIZE (vim/6.3.043) = 8053
+MD5 (vim/6.3.045) = 025814a6478f8d1bcf199ce6422b59be
+SIZE (vim/6.3.045) = 12283