diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index e38742866fda..77c754a3acc9 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PORTVERSION=	6.0y
+PORTVERSION=	6.0z
 PORTREVISION=	0
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 9f21a3af6059..499c43235b01 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,2 +1,2 @@
-MD5 (vim/vim-6.0y-src.tar.gz) = 00bb2a39670836692599e0b7f827257f
-MD5 (vim/vim-6.0y-rt.tar.gz) = ed5345be6f64803b075d4ab0798aebfb
+MD5 (vim/vim-6.0z-src.tar.gz) = 744d76f3efcac207cf52d73102015e97
+MD5 (vim/vim-6.0z-rt.tar.gz) = 1c501288b3f1457886a88ccf7175895e
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index 38ab0fbb8ed6..b930e642bbff 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -113,6 +113,7 @@ share/vim/%%VIM_VER%%/ftplugin/mail.vim
 share/vim/%%VIM_VER%%/ftplugin/make.vim
 share/vim/%%VIM_VER%%/ftplugin/man.vim
 share/vim/%%VIM_VER%%/ftplugin/python.vim
+share/vim/%%VIM_VER%%/ftplugin/ruby.vim
 share/vim/%%VIM_VER%%/ftplugin/vim.vim
 share/vim/%%VIM_VER%%/ftplugin/xs.vim
 share/vim/%%VIM_VER%%/ftplugof.vim
@@ -125,6 +126,7 @@ share/vim/%%VIM_VER%%/indent/make.vim
 share/vim/%%VIM_VER%%/indent/matlab.vim
 share/vim/%%VIM_VER%%/indent/perl.vim
 share/vim/%%VIM_VER%%/indent/python.vim
+share/vim/%%VIM_VER%%/indent/ruby.vim
 share/vim/%%VIM_VER%%/indent/sh.vim
 share/vim/%%VIM_VER%%/indent/tcl.vim
 share/vim/%%VIM_VER%%/indent/verilog.vim
@@ -231,6 +233,7 @@ share/vim/%%VIM_VER%%/syntax/docbk.vim
 share/vim/%%VIM_VER%%/syntax/dosbatch.vim
 share/vim/%%VIM_VER%%/syntax/dosini.vim
 share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dsl.vim
 share/vim/%%VIM_VER%%/syntax/dtd.vim
 share/vim/%%VIM_VER%%/syntax/dtml.vim
 share/vim/%%VIM_VER%%/syntax/dylan.vim
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index e38742866fda..77c754a3acc9 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PORTVERSION=	6.0y
+PORTVERSION=	6.0z
 PORTREVISION=	0
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
index 9f21a3af6059..499c43235b01 100644
--- a/editors/vim6/distinfo
+++ b/editors/vim6/distinfo
@@ -1,2 +1,2 @@
-MD5 (vim/vim-6.0y-src.tar.gz) = 00bb2a39670836692599e0b7f827257f
-MD5 (vim/vim-6.0y-rt.tar.gz) = ed5345be6f64803b075d4ab0798aebfb
+MD5 (vim/vim-6.0z-src.tar.gz) = 744d76f3efcac207cf52d73102015e97
+MD5 (vim/vim-6.0z-rt.tar.gz) = 1c501288b3f1457886a88ccf7175895e
diff --git a/editors/vim6/pkg-plist b/editors/vim6/pkg-plist
index 38ab0fbb8ed6..b930e642bbff 100644
--- a/editors/vim6/pkg-plist
+++ b/editors/vim6/pkg-plist
@@ -113,6 +113,7 @@ share/vim/%%VIM_VER%%/ftplugin/mail.vim
 share/vim/%%VIM_VER%%/ftplugin/make.vim
 share/vim/%%VIM_VER%%/ftplugin/man.vim
 share/vim/%%VIM_VER%%/ftplugin/python.vim
+share/vim/%%VIM_VER%%/ftplugin/ruby.vim
 share/vim/%%VIM_VER%%/ftplugin/vim.vim
 share/vim/%%VIM_VER%%/ftplugin/xs.vim
 share/vim/%%VIM_VER%%/ftplugof.vim
@@ -125,6 +126,7 @@ share/vim/%%VIM_VER%%/indent/make.vim
 share/vim/%%VIM_VER%%/indent/matlab.vim
 share/vim/%%VIM_VER%%/indent/perl.vim
 share/vim/%%VIM_VER%%/indent/python.vim
+share/vim/%%VIM_VER%%/indent/ruby.vim
 share/vim/%%VIM_VER%%/indent/sh.vim
 share/vim/%%VIM_VER%%/indent/tcl.vim
 share/vim/%%VIM_VER%%/indent/verilog.vim
@@ -231,6 +233,7 @@ share/vim/%%VIM_VER%%/syntax/docbk.vim
 share/vim/%%VIM_VER%%/syntax/dosbatch.vim
 share/vim/%%VIM_VER%%/syntax/dosini.vim
 share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dsl.vim
 share/vim/%%VIM_VER%%/syntax/dtd.vim
 share/vim/%%VIM_VER%%/syntax/dtml.vim
 share/vim/%%VIM_VER%%/syntax/dylan.vim