diff --git a/Makefile.am b/Makefile.am
index b4cee4eb..1b91a892 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,197 +1,196 @@
 # Copyright (c) 2009 Red Hat, Inc.
 #
 # Authors: Andrew Beekhof
 #	   Steven Dake (sdake@redhat.com)
 #
 # This software licensed under BSD license, the text of which follows:
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
 # - Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # - Redistributions in binary form must reproduce the above copyright notice,
 #   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
 # - Neither the name of the MontaVista Software, Inc. nor the names of its
 #   contributors may be used to endorse or promote products derived from this
 #   software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 SPEC			= $(PACKAGE_NAME).spec
 
 TARFILE			= $(PACKAGE_NAME)-$(VERSION).tar.gz
 
 EXTRA_DIST		= autogen.sh conf/corosync.conf.example $(SPEC).in \
 			  build-aux/git-version-gen \
 			  build-aux/gitlog-to-changelog \
 			  build-aux/release.mk \
 			  conf/lenses/tests/test_corosync.aug \
 			  conf/lenses/corosync.aug \
 			  conf/corosync.conf.example.udpu \
 			  .version
 
 AUTOMAKE_OPTIONS	= foreign
 
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf test_lense.sh
 
-dist_doc_DATA		= LICENSE INSTALL README.devmap \
-			  README.recovery SECURITY TODO AUTHORS
+dist_doc_DATA		= LICENSE INSTALL README.recovery SECURITY TODO AUTHORS
 
 corosysconfdir		= ${COROSYSCONFDIR}
 
 corosysconf_DATA	= conf/corosync.conf.example \
 			  conf/corosync.conf.example.udpu
 
 if INSTALL_AUGEAS
 corolensdir		= ${datadir}/augeas/lenses
 corolens_DATA		= conf/lenses/corosync.aug
 
 corolenstestdir		= ${corolensdir}/tests
 corolenstest_DATA	= conf/lenses/tests/test_corosync.aug
 endif
 
 SUBDIRS			= include lcr lib exec services tools test cts pkgconfig \
 			  man init conf
 
 coverity:
 	cov-build --dir=cov make
 	cov-analyze --dir cov --concurrency
 	cov-format-errors --dir cov
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/${COROSYSCONFDIR}/service.d
 	$(INSTALL) -d $(DESTDIR)/${COROSYSCONFDIR}/uidgid.d
 	$(INSTALL) -d $(DESTDIR)/${localstatedir}/lib/corosync
 	$(INSTALL) -d $(DESTDIR)/${localstatedir}/log/cluster
 	$(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
 
 uninstall-local:
 	rmdir $(DESTDIR)/${COROSYSCONFDIR}/service.d || :;
 	rmdir $(DESTDIR)/${COROSYSCONFDIR}/uidgid.d || :;
 	rmdir $(DESTDIR)/${localstatedir}/lib/corosync || :;
 	rmdir $(DESTDIR)/${localstatedir}/log/cluster || :;
 	rmdir $(DESTDIR)/${SOCKETDIR} || :;
 
 if AUGTOOL
 check_SCRIPTS = test_lense.sh
 TESTS = $(check_SCRIPTS)
 
 test_lense.sh:
 	echo "augparse -I $(srcdir)/conf/lenses/ $(srcdir)/conf/lenses/tests/test_corosync.aug" > $@
 	chmod +x $@
 
 endif
 
 lint:
 	for dir in lcr lib exec services tools test; do make -C $$dir lint; done
 
 .PHONY: doxygen
 doxygen:
 	@if [ "$(DOXYGEN)" = "" ] || [ "$(DOT)" = "" ] ; then \
 		echo "*********************************************" ; \
 		echo "***                                       ***" ; \
 		echo "*** You must install doxygen and graphviz ***" ; \
 		echo "*** to generate the API documentation.    ***" ; \
 		echo "***                                       ***" ; \
 		echo "*********************************************" ; \
 		exit 1 ; \
 	else \
 		mkdir -p doc/api && $(DOXYGEN) ; \
 	fi
 
 dist-clean-local:
 	rm -f autoconf automake autoheader test_lense.sh
 
 clean-generic:
 	rm -rf doc/api $(SPEC) $(TARFILE) test_lense.sh
 
 ## make rpm/srpm section.
 
 $(SPEC): $(SPEC).in
 	rm -f $@-t $@
 	date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
 	if [ -f .tarball-version ]; then \
 		gitver="$(shell cat .tarball-version)" && \
 		rpmver=$$gitver && \
 		alphatag="" && \
 		dirty="" && \
 		numcomm="0"; \
 	else \
 		gitver="$(shell git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
 		rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
 		alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \
 		vtag=`echo $$gitver | sed -e "s/-.*//g"` && \
 		numcomm=`git rev-list $$vtag..HEAD | wc -l` && \
 		git update-index --refresh > /dev/null 2>&1 || true && \
 		dirty=`git diff-index --name-only HEAD 2>/dev/null`; \
 	fi && \
 	if [ -n "$$dirty" ]; then dirty="dirty"; else dirty=""; fi && \
 	if [ "$$numcomm" = "0" ]; then \
 		sed \
 			-e "s#@version@#$$rpmver#g" \
 			-e "s#%glo.*alpha.*##g" \
 			-e "s#%glo.*numcomm.*##g" \
 			-e "s#@dirty@#$$dirty#g" \
 			-e "s#@date@#$$date#g" \
 		$< > $@-t; \
 	else \
 		sed \
 			-e "s#@version@#$$rpmver#g" \
 			-e "s#@alphatag@#$$alphatag#g" \
 			-e "s#@numcomm@#$$numcomm#g" \
 			-e "s#@dirty@#$$dirty#g" \
 			-e "s#@date@#$$date#g" \
 		$< > $@-t; \
 	fi; \
 	if [ -z "$$dirty" ]; then sed -i -e "s#%glo.*dirty.*##g" $@-t; fi
 	chmod a-w $@-t
 	mv $@-t $@
 
 $(TARFILE):
 	$(MAKE) dist
 
 RPMBUILDOPTS	= --define "_sourcedir $(abs_builddir)" \
 		  --define "_specdir $(abs_builddir)" \
 		  --define "_builddir $(abs_builddir)" \
 		  --define "_srcrpmdir $(abs_builddir)" \
 		  --define "_rpmdir $(abs_builddir)"
 
 srpm: clean
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
 
 rpm: clean
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
 
 # release/versioning
 BUILT_SOURCES	= .version
 .version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 
 dist-hook: gen-ChangeLog
 	echo $(VERSION) > $(distdir)/.tarball-version
 
 gen_start_date = 2000-01-01
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	if test -d .git; then						\
 		LC_ALL=C $(top_srcdir)/build-aux/gitlog-to-changelog		\
 			--since=$(gen_start_date) > $(distdir)/cl-t;	\
 		rm -f $(distdir)/ChangeLog;				\
 		mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
 	fi
diff --git a/corosync.spec.in b/corosync.spec.in
index b06bfe9d..84468022 100644
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -1,324 +1,324 @@
 %global alphatag @alphatag@
 %global numcomm @numcomm@
 %global dirty @dirty@
 
 # Conditionals
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
 %bcond_with testagents
 %bcond_with watchdog
 %bcond_with monitoring
 %bcond_with snmp
 %bcond_with dbus
 %bcond_with rdma
 %bcond_with systemd
 %bcond_with nss
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: @version@
 Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://ftp.corosync.org
 Source0: ftp://ftp:user@ftp.corosync.org/downloads/%{name}-%{version}/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
 # Build bits
 
 %define buildtrunk 0
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 BuildRequires: libqb-devel
 %if %{buildtrunk}
 BuildRequires: autoconf automake
 %endif
 %if %{with nss}
 BuildRequires: nss-devel
 %endif
 %if %{with rdma}
 BuildRequires: libibverbs-devel librdmacm-devel
 %endif
 %if %{with snmp}
 BuildRequires: net-snmp-devel
 %endif
 %if %{with dbus}
 BuildRequires: dbus-devel
 %endif
 %if %{with systemd}
 BuildRequires: systemd-units
 %endif
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
 %setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
 %build
 %if %{buildtrunk}
 ./autogen.sh
 %endif
 
 %if %{with rdma}
 export ibverbs_CFLAGS=-I/usr/include/infiniband \
 export ibverbs_LIBS=-libverbs \
 export rdmacm_CFLAGS=-I/usr/include/rdma \
 export rdmacm_LIBS=-lrdmacm \
 %endif
 %{configure} \
 %if %{with nss}
 	--enable-nss \
 %else
 	--disable-nss \
 %endif
 %if %{with testagents}
 	--enable-testagents \
 %endif
 %if %{with watchdog}
 	--enable-watchdog \
 %endif
 %if %{with monitoring}
 	--enable-monitoring \
 %endif
 %if %{with snmp}
 	--enable-snmp \
 %endif
 %if %{with dbus}
 	--enable-dbus \
 %endif
 %if %{with rdma}
 	--enable-rdma \
 %endif
 %if %{with systemd}
 	--enable-systemd \
 %endif
 	--with-initddir=%{_initrddir}
 
 make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
 %if %{with dbus}
 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
 
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
 # drop docs and html docs for now
 rm -rf %{buildroot}%{_docdir}/*
 
 %clean
 rm -rf %{buildroot}
 
 %description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
 %post
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add corosync || :
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
 	/sbin/service corosync stop &>/dev/null || :
 	/sbin/chkconfig --del corosync || :
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
 %{_sbindir}/corosync-keygen
 %{_sbindir}/corosync-objctl
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %{_sbindir}/corosync-notifyd
 %{_bindir}/corosync-blackbox
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/service.d
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
 %if %{with dbus}
 %{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
 %if %{with snmp}
 %{_datadir}/snmp/mibs/COROSYNC-MIB.txt
 %endif
 %if %{with systemd}
 %{_unitdir}/corosync.service
 %{_unitdir}/corosync-notifyd.service
 %else
 %{_initrddir}/corosync
 %{_initrddir}/corosync-notifyd
 %endif
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/coroparse.lcrso
 %{_libexecdir}/lcrso/objdb.lcrso
 %{_libexecdir}/lcrso/service_cfg.lcrso
 %{_libexecdir}/lcrso/service_cpg.lcrso
 %{_libexecdir}/lcrso/service_evs.lcrso
 %{_libexecdir}/lcrso/service_confdb.lcrso
 %{_libexecdir}/lcrso/service_pload.lcrso
 %{_libexecdir}/lcrso/quorum_votequorum.lcrso
 %{_libexecdir}/lcrso/quorum_testquorum.lcrso
 %{_libexecdir}/lcrso/vsf_quorum.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
 %if %{with watchdog}
 %{_libexecdir}/lcrso/service_wd.lcrso
 %endif
 %if %{with monitoring}
 %{_libexecdir}/lcrso/service_mon.lcrso
 %endif
 %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-notifyd.8*
 %{_mandir}/man8/corosync-quorumtool.8*
 %{_mandir}/man5/corosync.conf.5*
 
 
 # optional testagent rpm
 #
 %if %{with testagents}
 
 %package -n corosync-testagents
 Summary: The Corosync Cluster Engine Test Agents
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description -n corosync-testagents
 This package contains corosync test agents.
 
 %files -n corosync-testagents
 %defattr(755,root,root,-)
 %{_datadir}/corosync/tests/mem_leak_test.sh
 %{_datadir}/corosync/tests/net_breaker.sh
 %{_bindir}/cpg_test_agent
 %{_bindir}/confdb_test_agent
 %{_bindir}/sam_test_agent
 %{_bindir}/votequorum_test_agent
 %{_libexecdir}/lcrso/service_syncv2.lcrso
 
 %endif
 
 # library
 #
 %package -n corosynclib
 Summary: The Corosync Cluster Engine Libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description -n corosynclib
 This package contains corosync libraries.
 
 %files -n corosynclib
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/libcfg.so.*
 %{_libdir}/libcpg.so.*
 %{_libdir}/libconfdb.so.*
 %{_libdir}/libevs.so.*
 %{_libdir}/libtotem_pg.so.*
 %{_libdir}/liblogsys.so.*
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libpload.so.*
 %{_libdir}/libsam.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
 %postun -n corosynclib -p /sbin/ldconfig
 
 %package -n corosynclib-devel
 Summary: The Corosync Cluster Engine Development Kit
 Group: Development/Libraries
 Requires: corosynclib = %{version}-%{release}
 Requires: pkgconfig
 Provides: corosync-devel = %{version}
 Obsoletes: corosync-devel < 0.92-7
 
 %description -n corosynclib-devel
 This package contains include files and man pages used to develop using
 The Corosync Cluster Engine APIs.
 
 %files -n corosynclib-devel
 %defattr(-,root,root,-)
-%doc LICENSE README.devmap
+%doc LICENSE
 %dir %{_includedir}/corosync/
 %{_includedir}/corosync/cs_config.h
 %{_includedir}/corosync/corodefs.h
 %{_includedir}/corosync/cfg.h
 %{_includedir}/corosync/confdb.h
 %{_includedir}/corosync/corotypes.h
 %{_includedir}/corosync/cpg.h
 %{_includedir}/corosync/evs.h
 %{_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
 %dir %{_includedir}/corosync/totem/
 %{_includedir}/corosync/totem/totem.h
 %{_includedir}/corosync/totem/totemip.h
 %{_includedir}/corosync/totem/totempg.h
 %dir %{_includedir}/corosync/lcr/
 %{_includedir}/corosync/lcr/lcr_ckpt.h
 %{_includedir}/corosync/lcr/lcr_comp.h
 %{_includedir}/corosync/lcr/lcr_ifact.h
 %dir %{_includedir}/corosync/engine
 %{_includedir}/corosync/engine/config.h
 %{_includedir}/corosync/engine/coroapi.h
 %{_includedir}/corosync/engine/logsys.h
 %{_includedir}/corosync/engine/objdb.h
 %{_includedir}/corosync/engine/quorum.h
 %{_libdir}/libcfg.so
 %{_libdir}/libcpg.so
 %{_libdir}/libconfdb.so
 %{_libdir}/libevs.so
 %{_libdir}/libtotem_pg.so
 %{_libdir}/liblogsys.so
 %{_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/votequorum_overview.8*
 %{_mandir}/man8/sam_overview.8*
 
 %changelog
 * @date@ Autotools generated version <nobody@nowhere.org> - @version@-1-@numcomm@.@alphatag@.@dirty@
 - Autotools generated version