diff --git a/.cvsignore b/.cvsignore
index 4c48ceb..4524b03 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-corosync-1.2.3.tar.gz
+corosync-1.2.6.tar.gz
diff --git a/corosync.spec b/corosync.spec
index 8ff4113..0141caf 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.2.3
+Version: 1.2.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -25,7 +25,6 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
 %if %{buildtrunk}
 BuildRequires: autoconf automake
 %endif
-
 BuildRequires: nss-devel
 BuildRequires: libibverbs-devel librdmacm-devel
 
@@ -35,6 +34,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %setup -q -n %{name}-%{version}
 %patch0
 
+%build
 %if %{buildtrunk}
 ./autogen.sh
 %endif
@@ -46,9 +46,8 @@ export rdmacm_LIBS=-lrdmacm \
 %{configure} \
 	--enable-nss \
 	--enable-rdma \
-	--with-initddir=%{_initddir}
+	--with-initddir=%{_initrddir}
 
-%build
 make %{_smp_mflags}
 
 %install
@@ -70,7 +69,9 @@ This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
 %post
-/sbin/chkconfig --add corosync || :
+if [ $1 -eq 1 ]; then
+	/sbin/chkconfig --add corosync || :
+fi
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -93,7 +94,7 @@ fi
 %dir %{_sysconfdir}/corosync/service.d
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
-%{_initddir}/corosync
+%{_initrddir}/corosync
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/coroparse.lcrso
 %{_libexecdir}/lcrso/objdb.lcrso
@@ -107,8 +108,17 @@ fi
 %{_libexecdir}/lcrso/vsf_quorum.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
 %dir %{_localstatedir}/lib/corosync
+%dir %{_localstatedir}/log/cluster
 %{_mandir}/man8/corosync_overview.8*
+%{_mandir}/man8/corosync.8*
+%{_mandir}/man8/corosync-blackbox.8*
 %{_mandir}/man8/corosync-objctl.8*
+%{_mandir}/man8/corosync-keygen.8*
+%{_mandir}/man8/corosync-cfgtool.8*
+%{_mandir}/man8/corosync-cpgtool.8*
+%{_mandir}/man8/corosync-fplay.8*
+%{_mandir}/man8/corosync-pload.8*
+%{_mandir}/man8/corosync-quorumtool.8*
 %{_mandir}/man5/corosync.conf.5*
 
 %package -n corosynclib
@@ -214,6 +224,10 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Mon Jul  5 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.2.6-1
+- New upstream release
+- Resync spec file with upstream changes
+
 * Tue May 25 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.2.3-1
 - New upstream release
 - Rediff revision 2770 patch
diff --git a/sources b/sources
index e99be3c..a3a14c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03b8cc311619c07ae1a84a5d59f13d0b  corosync-1.2.3.tar.gz
+82d91373585f0d48cb98a8599a237e48  corosync-1.2.6.tar.gz