diff --git a/booth.spec.in b/booth.spec.in
index 7b4861d..8f33649 100644
--- a/booth.spec.in
+++ b/booth.spec.in
@@ -1,72 +1,117 @@
 
-%global alphatag @alphatag@
-%global numcomm @numcomm@
-%global dirty @dirty@
+%global test_path   	%{_datadir}/booth/tests
+
+%if 0%{?suse_version}
+%define _libexecdir %{_libdir}
+%endif
+%define with_extra_warnings   	0
+%define with_debugging  	0
+%define without_fatal_warnings 	1
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+%define pkg_group System Environment/Daemons
+%else
+%define pkg_group Productivity/Clustering/HA
+%endif
 
 Name:           booth
+Summary:        Ticket Manager for Multi-site Clusters
+License:        GPL-2.0+
+Group:          %{pkg_group}
 Version:        @version@
-Release:        1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
-Summary:        The Booth Cluster Ticket Manager.
-
-Group:          System Environment/Daemons
-License:        GPLv2
-URL:            http://www.clusterlabs.org
-Source0:        %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       booth
-
-Requires:       pacemaker
-
-BuildRequires:  autoconf automake libtool cluster-glue-libs-devel help2man
-%if %{with resource-monitor}
-BuildRequires:  pacemaker-libs-devel
-%endif
+Release:        0
+Source:         booth.tar.bz2
+Source1:        %name-rpmlintrc
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  asciidoc
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  glib2-devel
+BuildRequires:  libglue-devel
+BuildRequires:  libpacemaker-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  pkgconfig
+# the following is probably SUSE specific
+Requires:       pacemaker-ticket-support >= 2.0
 
 %description
 Booth manages the ticket which authorizes one of the cluster sites located in
 geographically dispersed distances to run certain resources. It is designed to
 be an add-on of Pacemaker, which extends Pacemaker to support geographically
 distributed clustering.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 
 %build
 ./autogen.sh
-
 %configure \
 	--with-initddir=%{_initrddir}
 
-make all
+make
 
 #except check
 #%check
 #make check
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make DESTDIR=$RPM_BUILD_ROOT install docdir=%{_defaultdocdir}/%{name}
+
+mkdir -p %{buildroot}/%{_mandir}/man8/
+gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz
+ln %{buildroot}/%{_mandir}/man8/booth.8.gz %{buildroot}/%{_mandir}/man8/boothd.8.gz 
+
+# systemd
+mkdir -p %{buildroot}/usr/lib/systemd/system/
+cp -a conf/booth@.service %{buildroot}/usr/lib/systemd/system/booth@.service
+
+#install test-parts
+
+mkdir -p %{buildroot}/%{test_path}
+cp -a unit-tests/ script/unit-test.py test conf %{buildroot}/%{test_path}/
+
+mkdir -p %{buildroot}/%{test_path}/src/
+ln -s %{_sbindir}/boothd %{buildroot}/%{test_path}/src/
+rm -f %{buildroot}/%{test_path}/test/*.pyc
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/booth/README 
-%doc %{_docdir}/booth/COPYING
 %{_sbindir}/booth
 %{_sbindir}/boothd
-%config %{_sysconfdir}/booth/booth.conf.example
+%{_initrddir}/booth-arbitrator
 %{_mandir}/man8/booth.8.gz
 %{_mandir}/man8/boothd.8.gz
-%dir /usr/lib/ocf/resource.d/pacemaker/
+%dir /usr/lib/ocf
+%dir /usr/lib/ocf/resource.d
+%dir /usr/lib/ocf/resource.d/pacemaker
+%dir %{_sysconfdir}/booth
 /usr/lib/ocf/resource.d/pacemaker/booth-site
-%{_initrddir}/booth-arbitrator
+%config %{_sysconfdir}/booth/booth.conf.example
+
+/usr/lib/systemd/system/booth@.service
+
 %dir %{_datadir}/booth
 %{_datadir}/booth/service-runnable
 
+%doc README COPYING
 
-%changelog
-* @date@ Autotools generated version <nobody@nowhere.org> - @version@-1-@numcomm@.@alphatag@.@dirty@
-- Autotools generated version
 
+%package test
+Summary:        Test scripts for Booth
+Group:          %{pkg_group}
+Requires:       booth
+Requires:       python
+
+%description test
+This package contains automated tests for Booth,
+the Cluster Ticket Manager for Pacemaker.
+
+%files test
+%defattr(-,root,root)
+
+%doc README-testing
+%{test_path}
+
+%changelog