diff --git a/gnu_parallel.spec b/gnu_parallel.spec
index 3f5d16d..440b01d 100644
--- a/gnu_parallel.spec
+++ b/gnu_parallel.spec
@@ -24,9 +24,9 @@ License:        GPL-3.0+
 Group:          Productivity/File utilities
 Url:            http://www.gnu.org/software/parallel/
 #DL-URL: 	http://ftp.gnu.org/gnu/parallel/
-Source0:        http://ftp.gnu.org/gnu/parallel/parallel-%{version}.tar.bz2
-Source1:        http://ftp.gnu.org/gnu/parallel/parallel-%{version}.tar.bz2.sig
-Source2:        %{name}.keyring
+Source:         http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2
+Source2:        http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2.sig
+Source3:        %name.keyring
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -49,27 +49,27 @@ or more computers.
 This subpackage contains the documentation for Parallel.
 
 %prep
-%setup -q -n parallel-%{version}
+%setup -q -n parallel-%version
 
 %build
-%configure --docdir="%{_docdir}/%{name}"
+%configure --docdir="%_docdir/%name"
 make %{?_smp_mflags}
 
 %install
 %make_install
-cp -a CITATION COPYING NEWS README "%{buildroot}/%{_docdir}/%{name}/"
+cp -a CITATION COPYING NEWS README "%buildroot/%_docdir/%name/"
 
 %files
 %defattr(-,root,root)
-%{_bindir}/niceload
-%{_bindir}/parallel
-%{_bindir}/sem
-%{_bindir}/sql
-%{_mandir}/man1/*.1*
-%{_mandir}/man7/*.7*
+%_bindir/niceload
+%_bindir/parallel
+%_bindir/sem
+%_bindir/sql
+%_mandir/man1/*.1*
+%_mandir/man7/*.7*
 
 %files doc
 %defattr(-,root,root)
-%{_docdir}/%{name}/
+%_docdir/%name/
 
 %changelog