diff --git a/arping2.spec b/arping2.spec
index fecbedd..f46b4cc 100644
--- a/arping2.spec
+++ b/arping2.spec
@@ -23,9 +23,9 @@ Summary:        Layer-2 Ethernet pinger
 License:        GPL-2.0-or-later
 URL:            http://www.habets.pp.se/synscan/programs.php?prog=arping
 #Git-Clone:	git://github.com/ThomasHabets/arping
-Source0:        http://www.habets.pp.se/synscan/files/arping-%{version}.tar.gz
-Source1:        http://www.habets.pp.se/synscan/files/arping-%{version}.tar.gz.asc
-Source2:        %{name}.keyring
+Source0:        http://www.habets.pp.se/synscan/files/arping-%version.tar.gz
+Source1:        http://www.habets.pp.se/synscan/files/arping-%version.tar.gz.asc
+Source2:        %name.keyring
 Patch1:         arping-setgroups.diff
 BuildRequires:  libnet-devel
 BuildRequires:  libpcap-devel
@@ -36,23 +36,22 @@ Arping is a util to find out it a specific IP address on the LAN is
 unrouted networks and with ICMP-blocking hosts.
 
 %prep
-%setup -q -n arping-%{version}
-%patch1 -p1
+%autosetup -n arping-%version -p1
 
 %build
 %configure
 %make_build
 
 %install
-b="%{buildroot}";
+b="%buildroot"
 %make_install
 # Avoid collision with iputils's inferior arping.
-mv "$b/%{_sbindir}"/{arping,%{name}};
-mv "$b/%{_mandir}/man8"/{arping.8,%{name}.8};
+mv "$b/%_sbindir/arping" "$b/%_sbindir/%name"
+mv "$b/%_mandir/man8/arping.8" "$b/%_mandir/man8/arping2.8"
 
 %files
-%{_sbindir}/arping2
-%{_mandir}/man8/arping2.8%{?ext_man}
+%_sbindir/arping2
+%_mandir/man8/arping2.8*
 %doc README
 
 %changelog