diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template
index e2866dcf943..57a2b79b404 100644
--- a/srcpkgs/nvi/template
+++ b/srcpkgs/nvi/template
@@ -1,12 +1,10 @@
 # Template file for 'nvi'
 pkgname=nvi
 version=1.81.6
-revision=5
+revision=6
 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_sprintf_count=yes"
 makedepends="ncurses-devel db-devel>=5.3"
 short_desc="The Berkeley Vi Editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,6 +14,11 @@ 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
 
+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
+}
 pre_build() {
 	sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' pathnames.h
 }