diff --git a/.gitignore b/.gitignore
index 5988649..e590578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ corosync-1.2.7.tar.gz
 /corosync-1.99.7.tar.gz
 /corosync-1.99.8.tar.gz
 /corosync-1.99.9.tar.gz
+/corosync-2.0.0.tar.gz
diff --git a/corosync.spec b/corosync.spec
index 70abebd..0855a40 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -16,8 +16,8 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.99.9
-Release: 1.1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Version: 2.0.0
+Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://ftp.corosync.org
@@ -98,7 +98,8 @@ export rdmacm_LIBS=-lrdmacm \
 %if %{with xmlconf}
 	--enable-xmlconf \
 %endif
-	--with-initddir=%{_initrddir}
+	--with-initddir=%{_initrddir} \
+	--with-systemddir=%{_unitdir}
 
 make %{_smp_mflags}
 
@@ -112,11 +113,6 @@ mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
 install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
-%if %{with systemd}
-mkdir -p %{buildroot}/%{_unitdir}/
-mv %{buildroot}/lib/systemd/system/*.service %{buildroot}/%{_unitdir}/
-%endif
-
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
@@ -192,6 +188,7 @@ fi
 %{_mandir}/man8/corosync-quorumtool.8*
 %{_mandir}/man5/corosync.conf.5*
 %{_mandir}/man5/votequorum.5*
+%{_mandir}/man8/cmap_keys.8*
 
 # optional testagent rpm
 #
@@ -294,6 +291,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/quorum_overview.8*
 
 %changelog
+* Tue Apr 10 2012 Jan Friesse <jfriesse@redhat.com> - 2.0.0-1
+- New upstream release
+
 * Thu Apr 05 2012 Karsten Hopp <karsten@redhat.com> 1.99.9-1.1
 - bump release and rebuild on PPC
 
diff --git a/sources b/sources
index 8861515..92d68ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-011fb6c8426b2f218cfaf169288a098d  corosync-1.99.9.tar.gz
+72592510e7a142e60191ff2468c116f8  corosync-2.0.0.tar.gz