diff --git a/Makefile.am b/Makefile.am
index 8360c89..5fa7913 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,47 +1,52 @@
 SUBDIRS = src agent man
 
 # .gz because github doesn't support .xz yet :-(
 
 TAG		?= $(shell git log --pretty="format:%H" -n 1)
 distdir		 = $(PACKAGE)-$(TAG)
 TARFILE		 = $(distdir).tar.gz
 DIST_ARCHIVES	 = $(TARFILE)
 
 RPM_ROOT	= $(shell pwd)
 RPM_OPTS	= --define "_sourcedir $(RPM_ROOT)" 	\
 		  --define "_specdir   $(RPM_ROOT)" 	\
 		  --define "_srcrpmdir $(RPM_ROOT)"
 
 MOCK_TARGET     ?= rhel-7.1-candidate-x86_64
 MOCK_OPTIONS	?= --resultdir=$(RPM_ROOT)/mock --no-cleanup-after
 
+BUILD_COUNTER	?= build.counter
+LAST_COUNT      = $(shell test ! -e $(BUILD_COUNTER) && echo 0; test -e $(BUILD_COUNTER) && cat $(BUILD_COUNTER))
+COUNT           = $(shell expr 1 + $(LAST_COUNT))
+
 export:
 	rm -f $(PACKAGE)-HEAD.tar.*
 	if [ -f $(TARFILE) ]; then						\
 	    echo `date`: Using existing tarball: $(TARFILE);			\
 	else									\
 	    rm -f $(PACKAGE).tar.*;						\
 	    git archive --prefix=$(distdir)/ $(TAG) | gzip > $(TARFILE);	\
 	    echo `date`: Rebuilt $(TARFILE);					\
 	fi
 
 srpm:	export
 	rm -f *.src.rpm
 	sed -i 's/global\ commit.*/global\ commit\ $(TAG)/' $(PACKAGE).spec
+	if [ -e $(BUILD_COUNTER) ]; then						\
+		sed -i 's/global\ build.*/global\ build\ $(COUNT)/' $(PACKAGE).spec	\
+		echo $(COUNT) > $(BUILD_COUNTER);					\
+	fi
 	rpmbuild $(RPM_OPTS) -bs $(PACKAGE).spec
 
 rpm:	export
 	rpmbuild $(RPM_OPTS) -ba $(PACKAGE).spec
 
 mock:   srpm
 	-rm -rf $(RPM_ROOT)/mock
 	@echo "mock --root=$* --rebuild $(MOCK_OPTIONS) $(RPM_ROOT)/*.src.rpm"
 	mock --root=$(MOCK_TARGET) --rebuild $(MOCK_OPTIONS) $(RPM_ROOT)/*.src.rpm
 
 beekhof: mock
 	cluster-helper -- 'rm -f sbd-*.x86_64.rpm'
 	cluster-helper --copy $(RPM_ROOT)/mock/sbd-*.x86_64.rpm {}: 
-	cluster-helper -- yum remove -y sbd sbd-debuginfo
 	cluster-helper -- yum install -y sbd-*.x86_64.rpm
-	cluster-helper -- chkconfig sbd on
-	cluster-helper -- cp /etc/sysconfig/sbd.rpmsave  /etc/sysconfig/sbd
diff --git a/sbd.spec b/sbd.spec
index 77180b1..f985ccd 100644
--- a/sbd.spec
+++ b/sbd.spec
@@ -1,122 +1,122 @@
 #
 # spec file for package sbd
 #
 # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Lars Marowsky-Bree
 #
 # 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.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-%global commit d47ad7410475d6e69ae04336740dd63053bd1819
+%global commit 872e82f39db02eab3527ecfa392b1a930dd1964b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global github_owner beekhof
-
+%global build 5
 
 Name:           sbd
 Summary:        Storage-based death
 License:        GPLv2+
 Group:          System Environment/Daemons
 Version:        1.2.1
-Release:        0.4.%{shortcommit}.git%{?dist}
+Release:        0.%{build}.%{shortcommit}.git%{?dist}
 Url:            https://github.com/%{github_owner}/%{name}
 Source0:        https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libuuid-devel
 BuildRequires:  glib2-devel
 BuildRequires:  libaio-devel
 BuildRequires:  corosync-devel
 BuildRequires:  pacemaker-libs-devel
 BuildRequires:  libtool
 BuildRequires:  libuuid-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 
 %if 0%{?rhel} > 0
 ExclusiveArch: i686 x86_64 s390x
 %endif
 
 %if %{defined systemd_requires}
 %systemd_requires
 %endif
 
 %description
 
 This package contains the storage-based death functionality.
 
 %prep
 ###########################################################
 # %setup -n sbd-%{version} -q
 %setup -q -n %{name}-%{commit}
 ###########################################################
 
 %build
 autoreconf -i
 export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror"
 %configure
 make %{?_smp_mflags}
 ###########################################################
 
 %install
 ###########################################################
 
 make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
 rm -rf ${RPM_BUILD_ROOT}%{_libdir}/stonith
 
 install -D -m 0755 src/sbd.sh $RPM_BUILD_ROOT/usr/share/sbd/sbd.sh
 %if %{defined _unitdir}
 install -D -m 0644 src/sbd.service $RPM_BUILD_ROOT/%{_unitdir}/sbd.service
 %endif
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 src/sbd.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/sbd
 
 %clean
 rm -rf %{buildroot}
 
 %if %{defined _unitdir}
 %post
 %systemd_post sbd.service
 
 %preun
 %systemd_preun sbd.service
 
 %postun
 %systemd_postun sbd.service
 %endif
 
 %files
 ###########################################################
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/sbd
 %{_sbindir}/sbd
 %{_datadir}/sbd
 %doc %{_mandir}/man8/sbd*
 %if %{defined _unitdir}
 %{_unitdir}/sbd.service
 %endif
 %doc COPYING
 
 %changelog
 * Mon Oct 13 2014 <andrew@beekhof.net> - 1.2.1-0.4.3de531ed.git
 - Fixes for suitability to the el7 environment
 
 * Tue Sep 30 2014 <andrew@beekhof.net> - 1.2.1-0.3.8f912945.git
 - Only build on archs supported by the HA Add-on
 
 * Fri Aug 29 2014 <andrew@beekhof.net> - 1.2.1-0.2.8f912945.git
 - Remove some additional SUSE-isms
 
 * Fri Aug 29 2014 <andrew@beekhof.net> - 1.2.1-0.1.8f912945.git
 - Prepare for package review
   Resolves: rhbz#1134245