diff --git a/libisofs.spec b/libisofs.spec
index b964d69..1a4ce8c 100644
--- a/libisofs.spec
+++ b/libisofs.spec
@@ -13,7 +13,7 @@ Source2:	gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
 Patch0:		libisofs-0.6.16-multilib.patch
 BuildRequires:	gnupg2
 BuildRequires:	gcc, libacl-devel, zlib-devel
-%if 0%{?rhel} >= 6 && 0%{?rhel} <= 8
+%if 0%{?rhel} && "%{name}" != "%{pkgname}"
 BuildRequires:	autoconf, automake, libtool
 %endif
 
@@ -34,6 +34,7 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}, pkgconfig
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%if 0%{!?_without_doc:1}
 %package doc
 Summary:	Documentation files for %{name}
 BuildArch:	noarch
@@ -43,14 +44,15 @@ BuildRequires:	doxygen, graphviz
 Libisofs is a library to create an ISO-9660 filesystem and supports
 extensions like RockRidge or Joliet. This package contains the API
 documentation for developing applications that use %{name}.
+%endif
 
 %prep
-gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .multilib
 
-# Rename from libisofs to libisofs1 for RHEL >= 6
-%if 0%{?rhel} >= 6 && 0%{?rhel} <= 8
+# Rename from libisofs to libisofs1 for EPEL
+%if 0%{?rhel} && "%{name}" != "%{pkgname}"
 sed -e 's@libisofs_libisofs@libisofs_libisofs1@g' \
     -e 's@libisofs/libisofs.la@libisofs/libisofs1.la@g' \
     -e 's@(includedir)/libisofs@(includedir)/libisofs1@g' \
@@ -65,7 +67,7 @@ autoreconf --force --install
 %build
 %configure --disable-static
 %make_build
-doxygen doc/doxygen.conf
+%{!?_without_doc:doxygen doc/doxygen.conf}
 
 %install
 %make_install
@@ -88,8 +90,10 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}*.pc
 
+%if 0%{!?_without_doc:1}
 %files doc
 %doc doc/html/
+%endif
 
 %changelog
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-3