diff --git a/bzip2.spec b/bzip2.spec
index 888fb7e..f3b764a 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -79,7 +79,7 @@ will use the bzip2 library (aka libz2).
 %if %{with pdf}
 %doc manual.pdf
 %endif
-/%{_lib}/libbz2.so
+%{_libdir}/libbz2.so
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
 
@@ -112,26 +112,17 @@ texi2dvi --pdf manual.texi
 %make_install -f Makefile-libbz2_so
 make install-bin install-dev -f Makefile DESTDIR=%{buildroot}
 
-install -m0755 bzme %{buildroot}%{_bindir}/
-install -m0755 bzgrep %{buildroot}%{_bindir}/
-install -m0644 bzgrep.1 %{buildroot}%{_mandir}/man1/
+install -m755 %{SOURCE1} -D %{buildroot}%{_bindir}/bzgrep
+install -m755 %{SOURCE2} -D %{buildroot}%{_bindir}/bzme
+install -m644 %{SOURCE3} -D %{buildroot}%{_mandir}/man1/bzme.1
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+install -m0644 bzip2.pc %{buildroot}%{_libdir}/pkgconfig
 
 cat > %{buildroot}%{_bindir}/bzless <<EOF
 #!/bin/sh
 %{_bindir}/bunzip2 -c "\$@" | %{_bindir}/less
 EOF
 chmod 755 %{buildroot}%{_bindir}/bzless
-install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1/
-
-# cleanup
-rm -f %{buildroot}%{_lib}/*.a
-
-# use e.g. /lib64 instead of /usr/lib64, because we have some binaries in /sbin and /bin, linked with libbz2.so.*
-mkdir -p %{buildroot}/%{_lib}
-mv -v %{buildroot}/%{_libdir}/* %{buildroot}/%{_lib}/
-
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-install -m0644 bzip2.pc %{buildroot}%{_libdir}/pkgconfig
 
 # Compatibility with Debian, Ubuntu and logics
 # https://bugzilla.rosalinux.ru/show_bug.cgi?id=9286