diff --git a/srcpkgs/nvi/patches/nvi-00-create-symlinks.patch b/srcpkgs/nvi/patches/nvi-00-create-symlinks.patch
new file mode 100644
index 00000000000..27659a53b31
--- /dev/null
+++ b/srcpkgs/nvi/patches/nvi-00-create-symlinks.patch
@@ -0,0 +1,38 @@
+--- a/dist/Makefile.in.orig	2013-02-16 11:00:25.023739458 +0100
++++ b/dist/Makefile.in	2013-02-16 11:01:06.572741213 +0100
+@@ -1689,9 +1689,9 @@ perlxsi.c:
+ install-exec-local:
+ 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+ 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+-	cd $(DESTDIR)$(bindir) && $(ln) \
++	cd $(DESTDIR)$(bindir) && $(LN_S) \
+ 		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+-	cd $(DESTDIR)$(bindir) && $(ln) \
++	cd $(DESTDIR)$(bindir) && $(LN_S) \
+ 		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+ 
+ install-data-local: install_common
+@@ -1712,9 +1712,9 @@ install-data-local: install_common
+ 	    $(rm) -f `echo ex.0 | sed '$(transform)'`
+ 	@cd $(DESTDIR)$(mandir)/cat1 && \
+ 	    $(rm) -f `echo view.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
++	@cd $(DESTDIR)$(mandir)/cat1 && $(LN_S) \
+ 	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
++	@cd $(DESTDIR)$(mandir)/cat1 && $(LN_S) \
+ 	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+ 	@[ -d $(DESTDIR)$(mandir)/man1 ] || \
+ 	    ($(mkdir) $(DESTDIR)$(mandir)/man1 && \
+@@ -1729,9 +1729,9 @@ install-data-local: install_common
+ 	    $(rm) -f `echo ex.1 | sed '$(transform)'`
+ 	@cd $(DESTDIR)$(mandir)/man1 && \
+ 	    $(rm) -f `echo view.1 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/man1 && $(ln) \
++	@cd $(DESTDIR)$(mandir)/man1 && $(LN_S) \
+ 	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/man1 && $(ln) \
++	@cd $(DESTDIR)$(mandir)/man1 && $(LN_S) \
+ 	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
+ install_common:
+ 	@[ -f $(chmod) ] || (echo 'chmod not found.'; exit 1)
diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template
index 7ec2681840d..0859a495fa8 100644
--- a/srcpkgs/nvi/template
+++ b/srcpkgs/nvi/template
@@ -1,41 +1,30 @@
 # Template file for 'nvi'
 pkgname=nvi
 version=1.81.6
-revision=3
+revision=4
 patch_args="-Np1"
 build_style=gnu-configure
 build_wrksrc=dist
 configure_args="--enable-widechar --enable-threads --disable-static
-vi_cv_path_preserve=/var/tmp"
+ vi_cv_path_preserve=/var/tmp"
 makedepends="ncurses-devel db-devel"
 short_desc="The Berkeley Vi Editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
-homepage="http://garage.linux.student.kuleuven.be/~skimo/nvi/"
-distfiles="http://garage.linux.student.kuleuven.be/~skimo//nvi/devel/nvi-$version.tar.bz2"
+homepage="http://garage.linux.student.kuleuven.be/~skimo/nvi"
+distfiles="${homepage}/devel/nvi-$version.tar.bz2"
 checksum=3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59
-long_desc="
- Nvi is an implementation of the ex/vi text editor originally distributed as
- part of the Fourth Berkeley Software Distribution (4BSD), by the University
- of California, Berkeley. The source code to nvi is freely available, and
- nvi may be freely redistributed.
 
- Nvi supports all the historic ex/vi features except for open mode and the
- lisp edit option (e.g., it has a fully implemented underlying ex mode).
-
- It has a number of additional features as well:
-
-    8-bit clean data, lines and files limited by available memory
-    Multiple edit buffers
-    Colon command-line editing and path name completion
-    Tag stacks (including support for Cscope databases)
-    Extended Regular Expressions
-    Infinite undo
-    Horizontal scrolling
-    Message catalogs (Dutch, English, French, German, Russian, Spanish, Swedish)
-    Preliminary support for Perl and Tcl/Tk scripting languages"
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	crossmakedepends="${makedepends}"
+	configure_args="${configure_args} vi_cv_sprintf_count=yes"
+fi
 
 pre_build() {
-	sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' \
-		pathnames.h
+	sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' pathnames.h
+}
+
+post_install() {
+	# remove cat pages.
+	rm -rf ${DESTDIR}/usr/share/man/cat1
 }