diff --git a/srcpkgs/virtuoso-base b/srcpkgs/virtuoso-base
new file mode 120000
index 00000000000..cc71021a303
--- /dev/null
+++ b/srcpkgs/virtuoso-base
@@ -0,0 +1 @@
+virtuoso
\ No newline at end of file
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
new file mode 100644
index 00000000000..941002a55bf
--- /dev/null
+++ b/srcpkgs/virtuoso/template
@@ -0,0 +1,53 @@
+# Template file for 'virtuoso'
+pkgname=virtuoso
+version=6.1.6
+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"
+short_desc="A scalable cross-platform server of virtuoso"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-opensource-${version}.tar.gz"
+checksum=c6bfa6817b3dad5f87577b68f4cf554d1bfbff48178a734084ac3dcbcea5a037
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
+virtuoso-base_package() {
+	short_desc+=" (very minimal installation)"
+	pkg_install() {
+		cd ${wrksrc}/binsrc/virtuoso
+		make DESTDIR=$PKGDESTDIR install
+		cd ${wrksrc}/binsrc/driver
+		make DESTDIR=$PKGDESTDIR install
+		# Install some useful tools; rename to avoid conflicts with unixodbc
+		for bin in isql isqlw; do
+			install -Dm755 ${wrksrc}/binsrc/tests/$bin \
+				${PKGDESTDIR}/usr/bin/${bin}-vt
+		done
+		# Remove static libs and libtool archives.
+		rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+	}
+}
+		
+virtuoso_package() {
+	pkg_install() {
+		vmove all
+		# remove conflicts with virtuoso-base
+		rm ${PKGDESTDIR}/usr/bin/isql{,w}
+		rm ${PKGDESTDIR}/usr/bin/virtuoso-t
+		rm ${PKGDESTDIR}/usr/lib/libvirtuoso-t.a
+		rm ${PKGDESTDIR}/usr/lib/virtodbc.{a,so}
+		rm ${PKGDESTDIR}/usr/lib/virtodbc_r.{a,so}
+		rm ${PKGDESTDIR}/usr/lib/virtodbcu.{a,so}
+		rm ${PKGDESTDIR}/usr/lib/virtodbcu_r.{a,so}
+		# remove static libs.
+		rm -f ${PKGDESTDIR}/usr/lib/virtuoso/hosting/*.a
+	}
+}