diff --git a/Makefile.am b/Makefile.am
index 5f2c09846..35db14506 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,154 +1,168 @@
 #
 # Copyright (C) 2008 Andrew Beekhof
 # Copyright (C) 2011 Fabio M. Di Nitto
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure DRF/config-h.in \
 			  missing install-sh autoscan.log configure.scan \
 			  DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar \
 			  compile config.guess config.sub depcomp
 
 SPEC			= $(PACKAGE_NAME).spec
 
 TARFILES		= $(PACKAGE_NAME)-$(VERSION).tar.bz2 \
 			  $(PACKAGE_NAME)-$(VERSION).tar.gz
 
 SUBDIRS =
 
 if BUILD_RGMANAGER
 SUBDIRS += rgmanager
 RGMANAGER = without
 else
 RGMANAGER = with
 endif
 
 if BUILD_LINUX_HA
 SUBDIRS	+= include heartbeat tools ldirectord doc
 LINUX_HA = without
 else
 LINUX_HA = with
 endif
 
 EXTRA_DIST		= autogen.sh .version make/release.mk \
 			  make/git-version-gen make/gitlog-to-changelog \
 			  AUTHORS COPYING COPYING.GPLv3 ChangeLog \
 			  $(SPEC).in
 
 install-exec-local:
 if BUILD_LINUX_HA
 	$(INSTALL) -d -m 1755 $(DESTDIR)$(HA_RSCTMPDIR)
 	$(LN_S) ../../lib/heartbeat/ocf-binaries $(DESTDIR)${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-binaries
 	$(LN_S) ../../lib/heartbeat/ocf-directories $(DESTDIR)${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-directories
 	$(LN_S) ../../lib/heartbeat/ocf-returncodes $(DESTDIR)${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-returncodes
 	$(LN_S) ../../lib/heartbeat/ocf-shellfuncs $(DESTDIR)${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-shellfuncs
 endif
 if BUILD_RGMANAGER
 if BUILD_LINUX_HA
 	$(LN_S) ${CLUSTERDATA} $(DESTDIR)${OCF_RA_DIR_PREFIX}/redhat
 endif
 	$(INSTALL) -d $(DESTDIR)/$(LOGDIR)
 endif
 
 dist-clean-local:
 	rm -f autoconf automake autoheader $(TARFILES)
 
 uninstall-local:
 			rmdir $(DESTDIR)/$(LOGDIR) || :;
 
 BUILT_SOURCES = .version
 .version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 
 dist-hook: gen-ChangeLog $(SPEC)
 	echo $(VERSION) > $(distdir)/.tarball-version
 	rm -f $(distdir)/$(SPEC) && \
 		cp $(top_srcdir)/$(SPEC) $(distdir)/$(SPEC)
 
 gen_start_date = 2000-01-01
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	if test -d .git; then 						\
 		LC_ALL=C $(top_srcdir)/make/gitlog-to-changelog		\
 			--since=$(gen_start_date) > $(distdir)/cl-t;	\
 		rm -f $(distdir)/ChangeLog.devel;			\
 		mv $(distdir)/cl-t $(distdir)/ChangeLog.devel;		\
 	fi
 
 ## 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 && \
+		if echo $$gitver | grep -q "\.[[:digit:]]rc[[:digit:]]"; then \
+			rpmver=`echo $$gitver | sed -e "s/rc[[:digit:]]//g"` && \
+			specver=`echo $$gitver | sed -e "s/.*rc/0.rc/g"`; \
+		else \
+			rpmver=$$gitver; \
+			specver="1"; \
+		fi && \
 		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"` && \
+		if echo $$gitver | grep -q "\.[[:digit:]]rc[[:digit:]]"; then \
+			rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/rc[[:digit:]]//g" -e "s/-.*//g"` && \
+			specver=`echo $$gitver | sed -e "s/.*rc/0.rc/g"`; \
+		else \
+			rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
+			specver="1"; \
+		fi && \
 		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" \
+			-e "s#@specver@#$$specver#g" \
 			-e "s#@rgmanager@#$(RGMANAGER)#g" \
 			-e "s#@linux-ha@#$(LINUX_HA)#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" \
+			-e "s#@specver@#$$specver#g" \
 			-e "s#@rgmanager@#$(RGMANAGER)#g" \
 			-e "s#@linux-ha@#$(LINUX_HA)#g" \
 		$< > $@-t; \
 	fi; \
 	if [ -z "$$dirty" ]; then sed -i -e "s#%glo.*dirty.*##g" $@-t; fi
 	chmod a-w $@-t
 	mv $@-t $@
 
 $(TARFILES):
 	$(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) $(TARFILES)
 	rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
 
 rpm: clean
 	$(MAKE) $(SPEC) $(TARFILES)
 	rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
 
 clean-generic:
 	rm -rf $(SPEC) $(TARFILES)
diff --git a/resource-agents.spec.in b/resource-agents.spec.in
index 66db7a831..cc5140cc7 100644
--- a/resource-agents.spec.in
+++ b/resource-agents.spec.in
@@ -1,309 +1,309 @@
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
 # file, is the same license as for the pristine package itself (unless the
 # license for the pristine package is not an Open Source License, in which
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
 
 %global alphatag @alphatag@
 %global numcomm @numcomm@
 %global dirty @dirty@
 
 # 
 # Since this spec file supports multiple distributions, ensure we
 # use the correct group for each.
 #
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
 %global SSLeay perl-Net_SSLeay
 %else
 %global SSLeay perl-Net-SSLeay
 %endif
 
 # determine the ras-set to process based on configure invokation
 %bcond_@rgmanager@ rgmanager
 %bcond_@linux-ha@ linuxha
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	@version@
-Release:	1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	@specver@%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		http://to.be.defined.com/
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 Group:		System Environment/Base
 %else
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.bz2
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
 
 ## Setup/build bits
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: perl python-devel
 BuildRequires: libxslt glib2-devel
 BuildRequires: which
 
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 BuildRequires: cluster-glue-libs-devel
 BuildRequires: docbook-style-xsl docbook-dtds
 %if 0%{?rhel} == 0
 BuildRequires: help2man libnet-devel
 %endif
 %endif
 
 %if 0%{?suse_version}  
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libnet1
 %else
 BuildRequires:  libnet
 %endif
 BuildRequires:  libglue-devel
 BuildRequires:  libxslt docbook_4 docbook-xsl-stylesheets
 %endif
 
 ## Runtime deps
 ## These apply to rgmanager agents only to guarantee agents
 ## are functional
 %if %{with rgmanager}
 # system tools shared by several agents
 Requires: /bin/bash /bin/grep /bin/sed /bin/gawk
 Requires: /bin/ps /usr/bin/pkill /bin/hostname
 Requires: /sbin/fuser
 Requires: /sbin/findfs /bin/mount
 
 # fs.sh
 Requires: /sbin/quotaon /sbin/quotacheck
 Requires: /sbin/fsck
 Requires: /sbin/fsck.ext2 /sbin/fsck.ext3 /sbin/fsck.ext4
 Requires: /sbin/fsck.xfs
 
 # ip.sh
 Requires: /sbin/ip /usr/sbin/ethtool
 Requires: /sbin/rdisc /usr/sbin/arping /bin/ping /bin/ping6
 
 # lvm.sh
 Requires: /sbin/lvm
 
 # netfs.sh
 Requires: /sbin/mount.nfs /sbin/mount.nfs4 /sbin/mount.cifs
 Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd
 %endif
 
 %description
 A set of scripts to interface with several services to operate in a
 High Availability environment for both Pacemaker and rgmanager
 service managers.
 
 %if %{with linuxha}
 %if 0%{?rhel} == 0
 %package -n ldirectord
 License:	GPLv2+
 Summary:	A Monitoring Daemon for Maintaining High Availability Resources
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 Group:		System Environment/Daemons
 %else
 Group:		Productivity/Clustering/HA
 %endif
 Obsoletes:	heartbeat-ldirectord <= %{version}
 Provides:	heartbeat-ldirectord = %{version}
 Requires:       %{SSLeay} perl-libwww-perl perl-MailTools
 Requires:       ipvsadm logrotate
 %if 0%{?fedora_version}
 Requires:	perl-Net-IMAP-Simple-SSL
 Requires(post):	/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 %endif
 
 %description -n ldirectord
 The Linux Director Daemon (ldirectord) was written by Jacob Rief.
 <jacob.rief@tiscover.com>
 
 ldirectord is a stand alone daemon for monitoring the services on real
 servers. Currently, HTTP, HTTPS, and FTP services are supported.
 lditrecord is simple to install and works with the heartbeat code
 (http://www.linux-ha.org/).
 
 See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 %endif
 %endif
 
 %prep
 %if 0%{?suse_version} == 0 && 0%{?fedora} == 0 && 0%{?centos_version} == 0 && 0%{?rhel} == 0
 %{error:Unable to determine the distribution/version. This is generally caused by missing /etc/rpm/macros.dist. Please install the correct build packages or define the required macros manually.}
 exit 1
 %endif
 %setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
 %build
 if [ ! -f configure ]; then
 	./autogen.sh
 fi
 
 %if 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
 CFLAGS="$(echo '%{optflags}')"
 %global conf_opt_rsctmpdir "--with-rsctmpdir=%{_var}/run/heartbeat/rsctmp"
 %global conf_opt_fatal "--enable-fatal-warnings=no"
 %else
 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
 %global conf_opt_fatal "--enable-fatal-warnings=yes"
 %endif
 
 %if %{with rgmanager}
 %global rasset rgmanager
 %endif
 %if %{with linuxha}
 %global rasset linux-ha
 %endif
 %if %{with rgmanager} && %{with linuxha}
 %global rasset all
 %endif
 
 export CFLAGS
 
 %configure \
 	%{?conf_opt_rsctmpdir:%conf_opt_rsctmpdir} \
 	%{conf_opt_fatal} \
 	--with-pkg-name=%{name} \
 	--with-ras-set=%{rasset}
 
 %if %{defined jobs}
 JFLAGS="$(echo '-j%{jobs}')"
 %else
 JFLAGS="$(echo '%{_smp_mflags}')"
 %endif
 
 make $JFLAGS
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 ## tree fixup
 # remove docs (there is only one and they should come from doc sections in files)
 rm -rf %{buildroot}/usr/share/doc/resource-agents
 
 %if %{with linuxha}
 %if 0%{?rhel} != 0
 # ldirectord isn't included on RHEL
 find %{buildroot} -name 'ldirectord.*' -exec rm -f {} \;
 find %{buildroot} -name 'ldirectord' -exec rm -f {} \;
 %endif
 
 %if 0%{?suse_version}
 test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin
 (
   cd %{buildroot}/sbin
   ln -sf /%{_sysconfdir}/init.d/ldirectord rcldirectord 
 ) || true
 %endif
 %endif
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.GPLv3 ChangeLog ChangeLog.devel
 %if %{with linuxha}
 %doc doc/README.webapps
 %doc %{_datadir}/%{name}/ra-api-1.dtd
 %endif
 
 %if %{with rgmanager}
 %{_datadir}/cluster
 %{_sbindir}/rhev-check.sh
 %endif
 
 %if %{with linuxha}
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
 %dir /usr/lib/ocf/lib
 
 /usr/lib/ocf/lib/heartbeat
 
 /usr/lib/ocf/resource.d/heartbeat
 %if %{with rgmanager}
 /usr/lib/ocf/resource.d/redhat
 %endif
 
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/ocft
 %{_datadir}/%{name}/ocft/configs
 %{_datadir}/%{name}/ocft/caselib
 %{_datadir}/%{name}/ocft/README
 %{_datadir}/%{name}/ocft/README.zh_CN
 
 %{_sbindir}/ocf-tester
 %{_sbindir}/ocft
 %{_sbindir}/sfex_init
 %{_sbindir}/sfex_stat
 
 %{_includedir}/heartbeat
 
 %if 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
 %dir %{_var}/run/heartbeat/rsctmp
 %else
 %dir %attr (1755, root, root)	%{_var}/run/resource-agents
 %endif
 
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/*.8*
 
 # For compatability with pre-existing agents
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/shellfuncs
 
 %{_libdir}/heartbeat
 %{_libdir}/heartbeat/send_arp
 %{_libdir}/heartbeat/sfex_daemon
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/tickle_tcp
 
 %if 0%{?rhel} == 0
 %if 0%{?suse_version}
 %preun -n ldirectord
 %stop_on_removal ldirectord
 %postun -n ldirectord
 %insserv_cleanup
 %endif
 
 %if 0%{?fedora}
 %preun -n ldirectord
 /sbin/chkconfig --del ldirectord
 %postun -n ldirectord -p /sbin/ldconfig
 %post -n ldirectord
 /sbin/chkconfig --add ldirectord
 %endif
 
 %files -n ldirectord
 %defattr(-,root,root)
 %{_sbindir}/ldirectord
 %doc ldirectord/ldirectord.cf COPYING
 %{_mandir}/man8/ldirectord.8*
 %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
 %dir %{_sysconfdir}/ha.d
 %dir %{_sysconfdir}/ha.d/resource.d
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_sysconfdir}/init.d/ldirectord
 %if 0%{?suse_version}
 /sbin/rcldirectord
 %endif
 %if 0%{?fedora}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 %endif
 %endif
 %endif
 
 %changelog
-* @date@ Autotools generated version <nobody@nowhere.org> - @version@-1-@numcomm@.@alphatag@.@dirty@
+* @date@ Autotools generated version <nobody@nowhere.org> - @version@-@specver@-@numcomm@.@alphatag@.@dirty@
 - Autotools generated version