diff --git a/libtalloc.spec b/libtalloc.spec
index b616b0c..6f43fdf 100644
--- a/libtalloc.spec
+++ b/libtalloc.spec
@@ -1,10 +1,12 @@
 %if 0%{?fedora} || 0%{?rhel} > 7
-%global with_python3 1
+%bcond_without python3
+%else
+%bcond_with python3
 %endif
 
 Name: libtalloc
 Version: 2.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: The talloc library
 License: LGPLv3+
 URL: https://talloc.samba.org/
@@ -19,7 +21,7 @@ Patch0001: 0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch
 BuildRequires: gcc
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
-%if 0%{?with_python3}
+%if %{with python3}
 BuildRequires: python3-devel
 %endif
 BuildRequires: doxygen
@@ -39,7 +41,7 @@ Requires: libtalloc = %{version}-%{release}
 %description devel
 Header files needed to develop programs that link against the Talloc library.
 
-%if 0%{?with_python3}
+%if %{with python3}
 %package -n python3-talloc
 Summary: Python bindings for the Talloc library
 Requires: libtalloc = %{version}-%{release}
@@ -81,7 +83,7 @@ doxygen doxy.config
 %make_install
 
 # Install API docs
-cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
+cp -a doc/man/man3 %{buildroot}%{_mandir}
 
 %files
 %{_libdir}/libtalloc.so.*
@@ -90,10 +92,10 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
 %{_includedir}/talloc.h
 %{_libdir}/libtalloc.so
 %{_libdir}/pkgconfig/talloc.pc
-%{_mandir}/man3/talloc*.3.gz
-%{_mandir}/man3/libtalloc*.3.gz
+%{_mandir}/man3/talloc*.3*
+%{_mandir}/man3/libtalloc*.3*
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python3-talloc
 %{_libdir}/libpytalloc-util.cpython*.so.*
 %{python3_sitearch}/talloc.cpython*.so
@@ -106,11 +108,14 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
 
 %ldconfig_scriptlets
 
-%if 0%{?with_python3}
+%if %{with python3}
 %ldconfig_scriptlets -n python3-talloc
 %endif
 
 %changelog
+* Thu Oct 22 2020 Andreas Schneider <asn@redhat.com> - 2.3.1-6
+- Spec file cleanup and improvements
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild