diff --git a/batctl.changes b/batctl.changes
index ea803e1..2a4e4b6 100644
--- a/batctl.changes
+++ b/batctl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 17 19:13:45 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
 ------------------------------------------------------------------
 Tue May 24 15:55:00 UTC 2011 - gregkh@suse.de
 
diff --git a/batctl.spec b/batctl.spec
index 683c552..205a717 100644
--- a/batctl.spec
+++ b/batctl.spec
@@ -15,13 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
+# Upstream First - Policy:
+# Never add any patches to this package without the upstream commit id
+# in the patch. Any patches added here without a very good reason to make
+# an exception will be silently removed with the next version update.
 
 Name:           batctl
 Summary:        B.A.T.M.A.N. advanced control and management tool
 Version:        2011.1.0
-Release:        1
+Release:        2
 License:        GPLv2
 Group:          Productivity/Networking/Other
 Url:            http://downloads.open-mesh.org/batman/stable/sources/batctl/
@@ -41,7 +43,7 @@ tcpdump and interfaces to the kernel module settings.
 %setup -n %{name}-%{version}
 
 %build
-%{__make} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
 %install
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
@@ -49,9 +51,6 @@ tcpdump and interfaces to the kernel module settings.
 %{__install} -m 644 man/%{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 %{__install} -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc README