diff --git a/csync2.spec b/csync2.spec
index 02c8cc5..190eadb 100644
--- a/csync2.spec
+++ b/csync2.spec
@@ -30,14 +30,15 @@ Source1:        csync2-README.quickstart
 Source2:        csync2-rm-ssl-cert
 Source3:        csync2.socket
 Source4:        csync2@.service
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch0:         csync2-fix-xinetd.patch
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch10:        add-ac_prog_cpp.patch
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch11:        fix-csync2_ssl_cert-filename.patch
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch12:        fix-sonames.patch
 
-Requires:       openssl
-Requires:       sqlite3
-%{?systemd_requires}
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -46,6 +47,9 @@ BuildRequires:  libgnutls-devel
 BuildRequires:  librsync-devel
 BuildRequires:  pkgconfig
 BuildRequires:  sqlite3-devel
+Requires:       openssl
+Requires:       sqlite3
+%{?systemd_requires}
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
@@ -62,7 +66,7 @@ much more than just 2 hosts, handle file deletions and can detect conflicts.
 It is expedient for HA-clusters, HPC-clusters, COWs and server farms.
 
 %prep
-%setup
+%setup -q
 # Is this next really necessary?
 %{?suse_update_config:%{suse_update_config}}
 
@@ -72,7 +76,7 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms.
 %patch12 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
 if ! [ -f configure ]; then ./autogen.sh; fi
 %configure --enable-sqlite3 \
 	--sysconfdir=%{_sysconfdir}/csync2 --docdir=%{_docdir}/%{name}
@@ -80,7 +84,7 @@ if ! [ -f configure ]; then ./autogen.sh; fi
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
 mkdir -p %{buildroot}%{_localstatedir}/lib/csync2
 install -p -D -m 644 csync2.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/csync2
 install -p -m 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/README.quickstart