diff --git a/.cvsignore b/.cvsignore
index 77e627c..215bc9c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-corosync-1.1.2.tar.gz
+corosync-1.2.0.tar.gz
diff --git a/corosync.spec b/corosync.spec
index d9394d0..005d1b6 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -1,13 +1,13 @@
-# define alphatag svn1211
+# global alphatag svn1211
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.2
+Version: 1.2.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
-Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
+Source0: http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -16,8 +16,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
+# Build bits
+
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -29,7 +30,7 @@ BuildRequires: libibverbs-devel librdmacm-devel
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n corosync-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -41,7 +42,8 @@ export rdmacm_CFLAGS=-I/usr/include/rdma \
 export rdmacm_LIBS=-lrdmacm \
 %{configure} \
 	--enable-nss \
-	--enable-rdma
+	--enable-rdma \
+	--with-initddir=%{_initddir}
 
 %build
 make %{_smp_mflags}
@@ -50,8 +52,6 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_initddir}
-install -m 755 init/redhat %{buildroot}%{_initddir}/corosync
 
 ## tree fixup
 # drop static libs
@@ -62,7 +62,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
@@ -75,10 +75,7 @@ if [ $1 -eq 0 ]; then
 	/sbin/chkconfig --del corosync || :
 fi
 
-%postun
-[ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
-
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
@@ -90,6 +87,7 @@ fi
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
+%dir %{_sysconfdir}/corosync/service.d
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %{_initddir}/corosync
@@ -113,7 +111,7 @@ fi
 %package -n corosynclib
 Summary: The Corosync Cluster Engine Libraries
 Group: System Environment/Libraries
-Conflicts: corosync < 0.92-7
+Requires: %{name} = %{version}-%{release}
 
 %description -n corosynclib
 This package contains corosync libraries.
@@ -132,6 +130,7 @@ This package contains corosync libraries.
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libpload.so.*
+%{_libdir}/libsam.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
@@ -166,6 +165,7 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/hdb.h
 %{_includedir}/corosync/list.h
 %{_includedir}/corosync/mar_gen.h
+%{_includedir}/corosync/sam.h
 %{_includedir}/corosync/swab.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
@@ -195,19 +195,34 @@ The Corosync Cluster Engine APIs.
 %{_libdir}/libquorum.so
 %{_libdir}/libvotequorum.so
 %{_libdir}/libpload.so
+%{_libdir}/libsam.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
 %{_mandir}/man3/confdb_*3*
 %{_mandir}/man3/votequorum_*3*
+%{_mandir}/man3/sam_*3*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
 %{_mandir}/man8/confdb_overview.8*
 %{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
 %{_mandir}/man8/coroipc_overview.8*
+%{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Tue Dec  8 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.2.0-1
+- New upstream release
+- Use global instead of define
+- Update Source0 url
+- Use more %name macro around
+- Cleanup install section. Init script is now installed by upstream
+- Cleanup whitespace
+- Don't deadlock between package upgrade and corosync condrestart
+- Ship service.d config directory
+- Fix Conflicts vs Requires
+- Ship new sam library and man pages
+
 * Fri Oct 23 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.1.2-1
 - New upstream release fixes major regression on specific loads
 
diff --git a/sources b/sources
index 48ee40f..ead7229 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz
+789bea831a97977e56900477c3022cc1  corosync-1.2.0.tar.gz