diff --git a/.cvsignore b/.cvsignore
index f1755fc..cba1459 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-virtuoso-opensource-5.0.12.tar.gz
+virtuoso-opensource-6.1.0.tar.gz
diff --git a/sources b/sources
index 493e4e6..fd355d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz
+49135390d27ab3e445f5e9481ab677bb  virtuoso-opensource-6.1.0.tar.gz
diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec
index 28dcb30..d59b588 100644
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@@ -1,6 +1,9 @@
 
+# set to omit demos
+%define _disable_all_vads   --disable-all-vads
+
 Name:	 virtuoso-opensource
-Version: 5.0.12
+Version: 6.1.0
 Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
@@ -10,14 +13,14 @@ License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
 Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
 #Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
-Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ## Upstreamable patches
 # fix build with ossl-1.0
 Patch50: virtuoso-opensource-5.0.11-openssl.patch
-# fix build --with-external-zlib
-Patch51: virtuoso-opensource-5.0.12-zlib.patch
+# based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch
+Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch
+Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
 
 BuildRequires: automake libtool
 BuildRequires: bison
@@ -34,6 +37,11 @@ BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
+%if 0%{?_disable_all_vads:1}
+Obsoletes: virtuoso-apps < 6.1.0
+Obsoletes: virtuoso-conductor < 6.1.0
+%endif
+
 
 %description
 Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML
@@ -79,7 +87,10 @@ Requires: %{name} = %{version}-%{release}
 %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
 
 %patch50 -p1 -b .openssl
-%patch51 -p1 -b .zlib
+%patch51 -p1 -b .external_iodbc
+%patch52 -p1 -b .nodemos_buildfix
+
+./autogen.sh
 
 
 %build
@@ -89,12 +100,12 @@ Requires: %{name} = %{version}-%{release}
   --enable-shared --disable-static \
   --without-internal-zlib \
   --with-debug \
-  --enable-iodbc \
+  --with-iodbc \
   --enable-openssl \
-  --enable-xml
+  --disable-imagemagick \
+  %{?_disable_all_vads} 
 
-# smp busted
-make 
+make %{?_smp_mflags}
 
 
 %install
@@ -102,6 +113,12 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+# silly that both binaries with internal vs. external libiodbc get built 
+mv %{buildroot}%{_bindir}/virtuoso-iodbc-t %{buildroot}%{_bindir}/virtuoso-t
+mv %{buildroot}%{_bindir}/isql-iodbc %{buildroot}%{_bindir}/isql
+mv %{buildroot}%{_bindir}/isqlw-iodbc %{buildroot}%{_bindir}/isqlw
+mv %{buildroot}%{_bindir}/odbc_mail %{buildroot}%{_bindir}/virt_mail
+
 mkdir -p %{buildroot}%{_sysconfdir}/virtuoso
 mv %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini %{buildroot}%{_sysconfdir}/virtuoso/
 ln -s ../../../..%{_sysconfdir}/virtuoso/virtuoso.ini %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini
@@ -112,6 +129,8 @@ mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \
    %{buildroot}%{_libexecdir}/virtuoso/
 
 ## unpackaged files 
+# iodbc-ized version of virt_mail, meh.
+rm -vf %{buildroot}%{_bindir}/odbc_mail
 rm -vf %{buildroot}%{_libdir}/*.{la,a}
 rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la
 rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar
@@ -135,6 +154,7 @@ rm -rf %{buildroot}
 %dir %{_var}/lib/virtuoso
 %{_var}/lib/virtuoso/db/
 
+%if ! 0%{?_disable_all_vads:1}
 %files apps
 %defattr(-,root,root,-)
 %{_libdir}/virtuoso/hosting/
@@ -145,6 +165,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_datadir}/virtuoso/vad/conductor_dav.vad
 %{_var}/lib/virtuoso/vsp/
+%endif
 
 %files doc
 %defattr(-,root,root,-)
@@ -157,6 +178,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 04 2010 Rex Dieter <rdieter@fedoraproject.org> 6.1.0-1
+- virtuoso-opensource-6.1.0
+- build only what we need for nepomuk, Obsoletes: -apps,-conductor
+
+* Sat Jan 09 2010 Rex Dieter <rdieter@fedoraproject.org> 6.0.0-1
+- virtuoso-opensource-6.0.0
+
 * Tue Oct 20 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.12-1
 - virtuoso-opensource-5.0.12