diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index d64bd1c165ab..4482027f2abb 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PORTVERSION=	6.0.21
+PORTVERSION=	6.0.23
 PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
@@ -20,7 +20,7 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9]*$//}
 
 PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
-.for p in	01 02 03 04 05 06 07 08 09 10 11 13 14 15 16 17 18 19 20 21
+.for p in	01 02 03 04 05 06 07 08 09 10 11 13 14 15 16 17 18 19 20 21 22 23
 PATCHFILES+=	${PORTVERSION:C/\.[0-9]*$//}.0${p}
 .endfor
 
@@ -49,7 +49,7 @@ MLINKS=		vim.1 rvim.1  vim.1 rview.1
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1  \
 		eview.1 gvimdiff.1
 
-MAKE_ARGS+=	CONF_OPT_MAX="--enable-max-features"
+MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
 .if defined(NO_GUI)
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index d7a31798c03e..720986ecb449 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -19,3 +19,5 @@ MD5 (vim/6.0.018) = ab49e18e8f7a1ff07d7c894cb4323293
 MD5 (vim/6.0.019) = a2254e5c3aa0bc86977fbb6d7abc8eca
 MD5 (vim/6.0.020) = 6fa7f140dcb08c37c3a399dfd1ccb254
 MD5 (vim/6.0.021) = 88a7cd77a83b7cb3f181c57a25485a2d
+MD5 (vim/6.0.022) = e758aec42ca9b718a6b3efbcd2c62aa5
+MD5 (vim/6.0.023) = 6e8b710c8ca7236546033aaffa595ac4