diff --git a/npth.spec b/npth.spec
index 3531596..300b0fe 100644
--- a/npth.spec
+++ b/npth.spec
@@ -26,11 +26,11 @@ Group:          Development/Libraries/C and C++
 URL:            https://gnupg.org/software/npth/
 #Git-Clone:	git://git.gnupg.org/npth
 #DL-URL:        ftp://ftp.gnupg.org/gcrypt/npth/
-Source:         ftp://ftp.gnupg.org/gcrypt/npth/%{name}-%{version}.tar.bz2
-Source2:        ftp://ftp.gnupg.org/gcrypt/npth/%{name}-%{version}.tar.bz2.sig
+Source:         ftp://ftp.gnupg.org/gcrypt/npth/%name-%version.tar.bz2
+Source2:        ftp://ftp.gnupg.org/gcrypt/npth/%name-%version.tar.bz2.sig
 # https://www.gnupg.org/signature_key.html
-Source4:        https://gnupg.org/signature_key.asc#/%{name}.keyring
-Source99:       %{name}.changes
+Source4:        https://gnupg.org/signature_key.asc#/%name.keyring
+Source99:       %name.changes
 
 %description
 nPth is a non-preemptive threads implementation using an API
@@ -38,11 +38,11 @@ similar to the one in GNU Pth. In contrast to Pth, nPth is
 based on the system's standard threads implementation. Thus, nPth
 allows the use of libraries which are not compatible to GNU Pth.
 
-%package -n %{lname}
+%package -n %lname
 Summary:        GNU Portable Threads library
 Group:          System/Libraries
 
-%description -n %{lname}
+%description -n %lname
 nPth is a non-preemptive threads implementation using an API
 similar to the one in GNU Pth. In contrast to Pth, nPth is
 based on the system's standard threads implementation. Thus, nPth
@@ -51,7 +51,7 @@ allows the use of libraries which are not compatible to GNU Pth.
 %package devel
 Summary:        Development files for the GNU New Portable Threads library
 Group:          Development/Libraries/C and C++
-Requires:       %{lname} = %{version}
+Requires:       %lname = %version
 
 %description devel
 nPth is a non-preemptive threads implementation using an API
@@ -63,30 +63,30 @@ This subpackage contains the headers for npth.
 %autosetup -p1
 
 %build
-date=$(date -u "+%%Y-%%m-%%dT%%H:%%M+0000" -r %{SOURCE99})
+date=$(date -u "+%%Y-%%m-%%dT%%H:%%M+0000" -r %SOURCE99)
 %configure \
 	--enable-build-timestamp="$date"
 %make_build
 
 %install
 %make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+find %buildroot -type f -name "*.la" -delete -print
 
 %check
 %make_build check
 
-%post   -n %{lname} -p /sbin/ldconfig
-%postun -n %{lname} -p /sbin/ldconfig
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
-%files -n %{lname}
-%{_libdir}/lib%{name}.so.*
+%files -n %lname
+%_libdir/lib%name.so.*
 
 %files devel
 %license COPYING.LIB
 %doc AUTHORS ChangeLog NEWS README
-%{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/%{name}.pc
-%{_includedir}/%{name}.h
-%{_datadir}/aclocal/%{name}.m4
+%_libdir/lib%name.so
+%_libdir/pkgconfig/%name.pc
+%_includedir/%name.h
+%_datadir/aclocal/%name.m4
 
 %changelog