diff --git a/.gitignore b/.gitignore
index a0a19de..19ae80e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/sphinx-2.0.6-release.tar.gz
-/sphinx-2.0.7-release.tar.gz
-/sphinx-2.0.8-release.tar.gz
-/sphinx-2.1.2-release.tar.gz
+/sphinx-2.*-release.tar.gz
diff --git a/sphinx.spec b/sphinx.spec
index 657924b..723520e 100644
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -4,27 +4,24 @@
 
 Name:           sphinx
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free open-source SQL full-text search engine
-
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://sphinxsearch.com
+
 Source0:        http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
 Source1:        searchd.service
 Patch0:         %{name}-2.0.3-fix_static.patch
 Patch1:         %{name}-2.0.3-default_listen.patch
 Patch2:         %{name}-aarch64.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRequires:  expat-devel
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
-BuildRequires:  expat-devel
-
+BuildRequires:  systemd
 # for fix-ups
 BuildRequires:  dos2unix
-#Requires:
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -141,7 +138,6 @@ make -C api/java
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"
 
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service
@@ -221,9 +217,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pre
 getent group %{sphinx_group} >/dev/null || groupadd -r %{sphinx_group}
 getent passwd %{sphinx_user} >/dev/null || \
@@ -260,7 +253,6 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql
 %dir %{_sysconfdir}/sphinx
 %config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf
@@ -276,28 +268,26 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/
 %{_mandir}/man1/*
 
 %files -n libsphinxclient
-%defattr(-,root,root,-)
 %doc COPYING api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
 %{_libdir}/libsphinxclient-0*.so
 
-
 %files -n libsphinxclient-devel
-%defattr(-,root,root,-)
 %{_libdir}/libsphinxclient.so
 %{_includedir}/*
 
 %files java
-%defattr(0644,root,root,0755)
 %doc api/java/README COPYING
 %{_javadir}/*
 
-
 %files php
-%defattr(0644,root,root,0755)
 %doc COPYING
 %{_datadir}/php/*
 
 %changelog
+* Sun Jan 26 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.2-2
+- Fix build with systemd
+- Cleanup and modernise spec
+
 * Sat Nov  2 2013 Christof Damian <christof@damian.net> - 2.1.2-1
 - upstream 2.1.2