diff --git a/plzip.spec b/plzip.spec
index 1a7c9ec..98c7c10 100644
--- a/plzip.spec
+++ b/plzip.spec
@@ -24,8 +24,8 @@ Summary:        Parallel LZMA Data Compressor
 License:        GPL-2.0-or-later
 Group:          Productivity/Archiving/Compression
 URL:            https://www.nongnu.org/lzip/plzip.html
-Source:         https://download.savannah.gnu.org/releases/lzip/plzip/%{name}-%{version}.tar.gz
-Source2:        https://download.savannah.gnu.org/releases/lzip/plzip/%{name}-%{version}.tar.gz.sig
+Source:         https://download.savannah.gnu.org/releases/lzip/plzip/%name-%version.tar.gz
+Source2:        https://download.savannah.gnu.org/releases/lzip/plzip/%name-%version.tar.gz.sig
 Source3:        %name.keyring
 BuildRequires:  c++_compiler
 BuildRequires:  lzlib-devel
@@ -54,7 +54,7 @@ pushd build/
 ../configure --prefix="%_prefix" --bindir="%_bindir" --datadir="%_datadir" \
 	--includedir="%_includedir" --infodir="%_infodir" --libdir="%_libdir" \
 	--mandir="%_mandir" --sysconfdir="%_sysconfdir" --enable-shared \
-	CC="gcc" CFLAGS="%optflags" CXX="g++" CXXFLAGS="%optflags"
+	CFLAGS="%optflags" CXXFLAGS="%optflags"
 %make_build
 popd
 
@@ -69,7 +69,7 @@ pushd build/
 popd
 
 %post
-%install_info --info-dir="%_infodir" "%_infodir/%{name}.info%ext_info"
+%install_info --info-dir="%_infodir" "%_infodir/%name.info%ext_info"
 
 %preun
 %install_info_delete --info-dir="%_infodir" "%_infodir/%name.info%ext_info"
@@ -78,7 +78,7 @@ popd
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
 %_bindir/plzip
-%_infodir/plzip.info%{?ext_info}
-%_mandir/man1/plzip.1%{?ext_man}
+%_infodir/plzip.info*
+%_mandir/man1/plzip.1*
 
 %changelog