diff --git a/.gitignore b/.gitignore
index 53bc20a..3f4088c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /softhsm-2.0.0b1.tar.gz
 /softhsm-2.0.0rc1.tar.gz
 /softhsm-2.0.0rc1.tar.gz.sig
+/softhsm-2.0.0.tar.gz
diff --git a/softhsm.spec b/softhsm.spec
index 1690274..165c6e2 100644
--- a/softhsm.spec
+++ b/softhsm.spec
@@ -1,11 +1,13 @@
+#global prever rc1
+
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
-Version: 2.0.0rc1
-Release: 3%{?dist}
+Version: 2.0.0
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
-Source: http://dist.opendnssec.org/source/testing/%{name}-%{version}.tar.gz
-Source1: http://dist.opendnssec.org/source/testing/%{name}-%{version}.tar.gz.sig
+Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz
+Source1: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz.sig
 Source2: softhsm.module
 # taken from coolkey which is not build on all arches we build on
 Source3: softhsm2-pk11install.c
@@ -33,18 +35,24 @@ with other cryptographic products because of the PKCS#11 interface.
 Summary: Development package of softhsm that includes the header files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}, openssl-devel, sqlite-devel
+%if 0%{?prever:1}
 BuildRequires: autoconf, libtool, automake
+%endif
 
 %description devel
 The devel package contains the libsofthsm include files
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prever}
+%if 0%{?prever:1}
 autoreconf -fiv
+%endif
 
 # remove softhsm/ subdir auto-added to --libdir
 sed -i "s:full_libdir/softhsm:full_libdir:g" configure
+%if 0%{?prever:1}
 sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
+%endif
 sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
 
 %build
@@ -96,7 +104,7 @@ ln -s ../pkcs11/libsofthsm2.so %{buildroot}/%{_libdir}/softhsm/libsofthsm.so
 %pre
 getent group ods >/dev/null || groupadd -r ods
 getent passwd ods >/dev/null || \
-    useradd -r -g ods -d /%{_sharedstatedir}/softhsm -s /sbin/nologin \
+    useradd -r -g ods -d %{_sharedstatedir}/softhsm -s /sbin/nologin \
     -c "softhsm private keys owner" ods
 exit 0
 
@@ -116,6 +124,12 @@ if [ -f /var/softhsm/slot0.db ]; then
 fi
 
 %changelog
+* Wed Sep 02 2015 Paul Wouters <pwouters@redhat.com> - 2.0.0-1
+- Resolves: rhbz#1244461 Update to softhsm-2.0.0
+- Resolves: rhbz#1177086 A marked as trusted certificate cannot be written in a softhsmv2 db
+- Resolves: rhbz#1159827 Typo in homedir in /etc/passwd
+- Added global prever to toggle snapshot vs full release build changes
+
 * Fri Jun 26 2015 Petr Spacek <pspacek@redhat.com> - 2.0.0rc1-3
 - Add dependency on OpenSSL with fixed AES wrapping support
 
diff --git a/sources b/sources
index 2a160b6..3ca4718 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7b8dc87eb589e7db356833562bece0f2  softhsm-2.0.0rc1.tar.gz.sig
-7b54b1d1465f331111ee56b902a38c75  softhsm-2.0.0rc1.tar.gz
+d72a3ad65229af3e43570f8be1a0703e  softhsm-2.0.0.tar.gz