diff --git a/cpuid.spec b/cpuid.spec
index 9b36e82..a70bdfb 100644
--- a/cpuid.spec
+++ b/cpuid.spec
@@ -23,11 +23,11 @@ Summary:        x86 CPU identification tool
 License:        GPL-2.0-or-later
 Group:          System/Management
 URL:            http://etallen.com/cpuid.html
-Source:         http://etallen.com/cpuid/%{name}-%{version}.src.tar.gz
+Source:         http://etallen.com/cpuid/%name-%version.src.tar.gz
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
 BuildRequires:  make
-ExclusiveArch:  %{ix86} x86_64
+ExclusiveArch:  %ix86 x86_64
 
 %description
 cpuid executes the CPUID instruction on x86-family CPUs and decodes
@@ -40,18 +40,18 @@ Cyrix CPUs, and is fairly complete.
 %build
 # remove -Werror=format-security which is used on Mandriva, as it produces
 # a false positive compiler error on several printf calls:
-CFLAGS=$(echo "%{optflags} -Wall" | sed 's/-Werror=format-security//g')
+CFLAGS=$(echo "%optflags -Wall" | sed 's/-Werror=format-security//g')
 %make_build CFLAGS="$CFLAGS"
 
 %install
-mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}/%{_mandir}/man1"
-install -pm0755 cpuid cpuinfo2cpuid "%{buildroot}/%{_bindir}/"
-install -pm0644 cpuid.man "%{buildroot}/%{_mandir}/man1/cpuid.1"
+mkdir -p "%buildroot/%_bindir" "%buildroot/%_mandir/man1"
+install -pm0755 cpuid cpuinfo2cpuid "%buildroot/%_bindir/"
+install -pm0644 cpuid.man "%buildroot/%_mandir/man1/cpuid.1"
 
 %files
 %doc ChangeLog
 %license LICENSE
-%{_bindir}/*
-%{_mandir}/man1/*.1%{?ext_man}
+%_bindir/*
+%_mandir/man1/*.1%{?ext_man}
 
 %changelog