diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index f8b60e539f..4258b64415 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -3,11 +3,9 @@ pkgname=vim
 _distver=7.3
 _patchver=600
 version=${_distver}.${_patchver}
-revision=2
+revision=3
 nofetch=yes
 noextract=yes
-provides="vi-$version"
-replaces="vi>=0"
 subpackages="vim-common vim-x11 gvim"
 depends="vim-common>=$version"
 makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel gtk+-devel"
@@ -39,7 +37,8 @@ do_configure() {
 		--disable-rubyinterp --disable-cscope --disable-workshop \
 		--disable-netbeans --disable-sniff --disable-gpm \
 		--disable-hangulinput --disable-xim --enable-multibyte \
-		--with-tlib=ncursesw"
+		--with-tlib=ncursesw --with-ex-name=vim-ex \
+		--with-view-name=vim-view"
 
 	# Normal version.
 	cd $wrksrc
@@ -65,4 +64,9 @@ do_build() {
 
 do_install() {
 	make DESTDIR=$DESTDIR install
+	# Create vim-ex symlink.
+	cd ${DESTDIR}/usr/bin && ln -sf vim vim-ex
+	rm -f ${DESTDIR}/usr/bin/{ex,view}
+
+	find ${DESTDIR}/usr/share/man -type f -name evim.1 -delete
 }
diff --git a/srcpkgs/vim/vim-x11.template b/srcpkgs/vim/vim-x11.template
index 163782ef6b..f4c37977ae 100644
--- a/srcpkgs/vim/vim-x11.template
+++ b/srcpkgs/vim/vim-x11.template
@@ -1,7 +1,7 @@
 # Template file for 'vim-x11'.
 #
-provides="vi-${version} vim-${version}"
-replaces="vim>=0 vi>=0"
+provides="vim-${version}"
+replaces="vim>=0"
 short_desc="VI iMproved - X11 version"
 long_desc="${long_desc}
 
@@ -10,5 +10,6 @@ long_desc="${long_desc}
 do_install() {
 	cd $wrksrc/vim-x11
 	make DESTDIR=$DESTDIR install
+	rm -f ${DESTDIR}/usr/bin/{ex,view}
 	rm -rf $DESTDIR/usr/share
 }