diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template
index 31785d1c4bd..701ebaceb03 100644
--- a/srcpkgs/nvi/template
+++ b/srcpkgs/nvi/template
@@ -1,7 +1,7 @@
 # Template file for 'nvi'
 pkgname=nvi
 version=1.81.6
-revision=10
+revision=11
 patch_args="-Np1"
 build_pie=yes
 build_style=gnu-configure
@@ -15,10 +15,20 @@ homepage="http://garage.linux.student.kuleuven.be/~skimo/nvi"
 distfiles="http://pkgs.fedoraproject.org/repo/pkgs/nvi/nvi-${version}.tar.bz2/88d1e23115ee9f2961186b62e55f5704/nvi-${version}.tar.bz2"
 checksum=3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59
 
+alternatives="
+ ex:/usr/bin/ex:/usr/bin/nvi-ex
+ ex:/usr/share/man/man1/ex.1:/usr/share/man/man1/nvi-ex.1
+ vi:/usr/bin/vi:/usr/bin/nvi-vi
+ vi:/usr/share/man/man1/vi.1:/usr/share/man/man1/nvi-vi.1
+ view:/usr/bin/view:/usr/bin/nvi-view
+ view:/usr/share/man/man1/view.1:/usr/share/man/man1/nvi-view.1
+"
+
 do_configure() {
 	export OPTFLAG="$CFLAGS"
 	./configure ${configure_args} --enable-widechar --enable-threads \
-		--disable-static vi_cv_path_preserve=/var/tmp vi_cv_sprintf_count=yes
+		--disable-static vi_cv_path_preserve=/var/tmp --program-prefix=nvi- \
+		vi_cv_sprintf_count=yes
 }
 pre_build() {
 	sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' pathnames.h