diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 696bfffe8f1f..e6f45837b64b 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	vim
 PORTVERSION=	6.0aw
-PORTREVISION?=	0
+PORTREVISION?=	6
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unreleased/unix/ \
@@ -19,10 +19,10 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
 		ftp://ftp.progsoc.uts.edu.au/pub/vim/unreleased/unix/
 DISTNAME=	vim-${PORTVERSION}
 
-#PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
-#.for p in 01
-#PATCHFILES+=	6.0.0${p}
-#.endfor
+PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
+.for p in 01 02 03 05 06
+PATCHFILES+=	6.0aw.0${p}
+.endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
 
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index ff2e75d7c6d4..52a915a3b34a 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1 +1,7 @@
 MD5 (vim/vim-6.0aw.tar.bz2) = aaa02e4b7a3c06494f103d18e1637ed4
+MD5 (vim/6.0aw.001) = e92b82bf0768cb158d7fea8ad71ff4bd
+MD5 (vim/6.0aw.002) = 93e8997a2b2573b3025bd3d8fe76bffa
+MD5 (vim/6.0aw.003) = 593303596df2b03fd37188aea4533aad
+MD5 (vim/6.0aw.004) = 4b82ca6506953b2fc0d54033e7d5d299
+MD5 (vim/6.0aw.005) = ff569df3cd4aeff03871b4e724652a46
+MD5 (vim/6.0aw.006) = e60e23ddf6a87b03d70da964654cdee1
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 696bfffe8f1f..e6f45837b64b 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	vim
 PORTVERSION=	6.0aw
-PORTREVISION?=	0
+PORTREVISION?=	6
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unreleased/unix/ \
@@ -19,10 +19,10 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
 		ftp://ftp.progsoc.uts.edu.au/pub/vim/unreleased/unix/
 DISTNAME=	vim-${PORTVERSION}
 
-#PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
-#.for p in 01
-#PATCHFILES+=	6.0.0${p}
-#.endfor
+PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
+.for p in 01 02 03 05 06
+PATCHFILES+=	6.0aw.0${p}
+.endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
 
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
index ff2e75d7c6d4..52a915a3b34a 100644
--- a/editors/vim6/distinfo
+++ b/editors/vim6/distinfo
@@ -1 +1,7 @@
 MD5 (vim/vim-6.0aw.tar.bz2) = aaa02e4b7a3c06494f103d18e1637ed4
+MD5 (vim/6.0aw.001) = e92b82bf0768cb158d7fea8ad71ff4bd
+MD5 (vim/6.0aw.002) = 93e8997a2b2573b3025bd3d8fe76bffa
+MD5 (vim/6.0aw.003) = 593303596df2b03fd37188aea4533aad
+MD5 (vim/6.0aw.004) = 4b82ca6506953b2fc0d54033e7d5d299
+MD5 (vim/6.0aw.005) = ff569df3cd4aeff03871b4e724652a46
+MD5 (vim/6.0aw.006) = e60e23ddf6a87b03d70da964654cdee1