diff --git a/.gitignore b/.gitignore
index 0e05b9f..b1b4513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/virtuoso-opensource-6.1.2.tar.gz
-/virtuoso-opensource-6-20110105.tar.gz
+virtuoso-opensource-6.1.2.tar.gz
diff --git a/sources b/sources
index c88f734..2eaf4e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d406b41d0b3b4636d07b06d16331827  virtuoso-opensource-6-20110105.tar.gz
+0519e1f104428e0c8b25fad89e3c57ef  virtuoso-opensource-6.1.2.tar.gz
diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec
index 3f368f1..2716766 100644
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@@ -2,12 +2,12 @@
 # set to omit demos
 #define _disable_all_vads   --disable-all-vads
 
-%define pre rc3
-%define snap 20110105
+#define pre rc3
+#define snap 20110105
 
 Name:    virtuoso-opensource
-Version: 6.1.3
-Release: 0.1.%{pre}.%{snap}%{?dist}
+Version: 6.1.2
+Release: 3%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -26,7 +26,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch
 Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
 
-BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gperf
@@ -42,6 +41,7 @@ BuildRequires: zlib-devel
 Provides: virtuoso = %{version}-%{release}
 
 %if 0%{?_disable_all_vads:1}
+BuildRequires: automake libtool
 Obsoletes: virtuoso-opensource-apps < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-doc < %{version}-%{release} 
@@ -64,7 +64,9 @@ Requires: %{name} = %{version}-%{release}
 Summary: Server pages 
 Group:   Applications/Databases
 Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch: noarch
+%endif
 %description conductor 
 %{summary}.
 
@@ -72,7 +74,9 @@ BuildArch: noarch
 Summary: Documentation 
 Group:   Documentation 
 Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch: noarch
+%endif
 %description doc 
 %{summary}.
 
@@ -88,9 +92,11 @@ Requires: %{name} = %{version}-%{release}
 %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}}
 
 #patch51 -p1 -b .external_iodbc
-%patch52 -p1 -b .nodemos_buildfix
 
+%if 0%{?_disable_all_vads:1}
+%patch52 -p1 -b .nodemos_buildfix
 ./autogen.sh
+%endif
 
 find -name "*.jar"
 find -name "*.jar" -delete
@@ -196,8 +202,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Jan 06 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.3-0.1.rc3.20110105
-- virtuoso-opensource-6-20110105 snapshot
+* Thu Jan 13 2011 Rex Dieter <rdieter@fedoraproject.org> 6.1.2-3 
+- don't autogen.sh things by default
 
 * Thu Oct 21 2010 Pierre-Yves Chibon <pingou@pingoured.fr> 6.1.2-2
 - Enable creation subpackage -conductor