diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes
index f2ba18f..26082e3 100644
--- a/apache2-mod_security2.changes
+++ b/apache2-mod_security2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  3 09:41:02 UTC 2014 - pgajdos@suse.com
+
+- call spec-cleaner
+- use apache rpm macros
+
 -------------------------------------------------------------------
 Wed Aug 27 17:30:25 CEST 2014 - draht@suse.de
 
diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec
index 0462382..ba4a5c5 100644
--- a/apache2-mod_security2.spec
+++ b/apache2-mod_security2.spec
@@ -16,37 +16,19 @@
 #
 
 
-Name:           apache2-mod_security2
-Version:        2.8.0
-Release:        0.1
-#
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  apache2-devel
-BuildRequires:  apache2-prefork
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  c++_compiler
-BuildRequires:  libcurl-devel
-BuildRequires:  libtool
-BuildRequires:  libxml2-devel
-BuildRequires:  lua-devel
-BuildRequires:  pcre-devel
-%define apache        apache2
 %define modname       mod_security2
 %define tarballname   modsecurity-%{version}
 #
-%define apxs              %{_sbindir}/apxs2
-%define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
-%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
-%define apache_mmn       %(MMN=$(%{apxs} -q LIBEXECDIR)/MMN; test -x $MMN && $MMN)
-%define usrsharedir %{_prefix}/share/%{name}
+%define usrsharedir %{_datadir}/%{name}
 %define refman Reference-Manual.html
 %define faq ModSecurity-Frequently-Asked-Questions-FAQ.html
-%if 0%{?apache_mmn}
-Requires:       %{apache_mmn}
-%endif
-Requires:       apache2
+Name:           apache2-mod_security2
+Version:        2.8.0
+Release:        0
+#
+Summary:        ModSecurity Open Source Web Application Firewall
+License:        Apache-2.0
+Group:          Productivity/Networking/Web/Servers
 #
 Url:            http://www.modsecurity.org/
 Source:         https://www.modsecurity.org/tarball/%{version}/%{tarballname}.tar.gz
@@ -58,10 +40,22 @@ Source5:        modsecurity_diagram_apache_request_cycle.jpg
 Source6:        README-SUSE-mod_security2.txt
 Source7:        empty.conf
 Patch0:         apache2-mod_security2-no_rpath.diff
+BuildRequires:  apache-rpm-macros
+BuildRequires:  apache2-devel
+BuildRequires:  apache2-prefork
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  c++_compiler
+BuildRequires:  libcurl-devel
+BuildRequires:  libtool
+BuildRequires:  libxml2-devel
+BuildRequires:  lua-devel
+BuildRequires:  pcre-devel
+Requires:       %{apache_mmn}
+Requires:       apache2
 #
-Summary:        ModSecurity Open Source Web Application Firewall
-License:        Apache-2.0
-Group:          Productivity/Networking/Web/Servers
+#
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 ModSecurity(TM) is an open source intrusion detection and prevention
@@ -73,10 +67,9 @@ applications from known and unknown attacks.
 The modsecurity team also offer a commercial version of their excellent
 ruleset. Please have a look at http://www.modsecurity.org/ for more details.
 
-
 %prep
-%setup -n %{tarballname}
-%setup -D -T -a 1 -n %{tarballname}
+%setup -q -n %{tarballname}
+%setup -q -D -T -a 1 -n %{tarballname}
 mv -v SpiderLabs* rules
 bzip2 -dc %{SOURCE3} > %{_sourcedir}/%{refman} && touch -r %{SOURCE3} %{_sourcedir}/%{refman}
 bzip2 -dc %{SOURCE4} > %{_sourcedir}/%{faq} && touch -r %{SOURCE4} %{_sourcedir}/%{faq}
@@ -93,11 +86,11 @@ aclocal
 autoreconf -fi
 %endif
 automake
-./configure --with-apxs=%{apxs} --enable-request-early --enable-htaccess-config
+./configure --with-apxs=%{apache_apxs} --enable-request-early --enable-htaccess-config
 CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 %install
-pushd %{apache}
+pushd apache2
   install -d -m 0755 %{buildroot}%{apache_libexecdir}
   install .libs/mod_security2.so %{buildroot}%{apache_libexecdir}/%{modname}.so
 popd
@@ -124,10 +117,6 @@ rm -f %{buildroot}/%{usrsharedir}/rules/INSTALL %{buildroot}/%{usrsharedir}/rule
 mv %{buildroot}/%{usrsharedir}/rules/modsecurity_crs_10_setup.conf.example \
   %{buildroot}/%{usrsharedir}/rules/modsecurity_crs_10_setup.conf
 
-%clean
-%{__rm} -rf %{buildroot};
-%{__rm} -f %{_sourcedir}/%{faq} %{_sourcedir}/%{refman}
-
 %files
 %defattr(-, root, root, 0755)
 %{apache_libexecdir}/%{modname}.so