diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7ec13aa19bd..2290f67857e 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -3,8 +3,6 @@ pkgname=virtuoso
 version=6.1.7
 revision=1
 build_style=gnu-configure
-configure_args="--without-internal-zlib --with-readline
- --with-layout=debian --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'"
 wrksrc="${pkgname}-opensource-${version}"
 hostmakedepends="flex gperf net-tools"
 makedepends="libldap-devel readline-devel libxml2-devel openssl-devel mit-krb5-devel"
@@ -19,6 +17,11 @@ if [ "$CROSS_BUILD" ]; then
 	makedepends+=" libfl-devel"
 fi
 
+do_configure() {
+	./configure ${configure_args} --without-internal-zlib --with-readline \
+		--with-layout=debian --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
+}
+
 virtuoso-base_package() {
 	short_desc+=" (very minimal installation)"
 	pkg_install() {
@@ -40,7 +43,7 @@ virtuoso_package() {
 	pkg_install() {
 		vmove all
 		# remove conflicts with virtuoso-base
-		rm ${PKGDESTDIR}/usr/bin/isql{,w}
+		rm ${PKGDESTDIR}/usr/bin/isql{,w-vt}
 		rm ${PKGDESTDIR}/usr/bin/virtuoso-t
 		rm ${PKGDESTDIR}/usr/lib/libvirtuoso-t.a
 		rm ${PKGDESTDIR}/usr/lib/virtodbc.{a,so}