diff --git a/pam.spec b/pam.spec
index 11f6836..49b3892 100644
--- a/pam.spec
+++ b/pam.spec
@@ -4,7 +4,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.5.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+
 # - this option is redundant as the BSD license allows that anyway.
 # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.
@@ -33,38 +33,25 @@ Patch3:  pam-1.3.0-unix-nomsg.patch
 
 %{load:%{SOURCE3}}
 
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%global WITH_SELINUX 1
-%endif
-%if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
-%global WITH_AUDIT 1
-%endif
-%global _performance_build 1
-
 ### Dependencies ###
-Requires: libeconf >= 0.3.5
-Requires: libpwquality >= 0.9.9
+Requires: libpwquality%{?_isa}
 Requires: setup
-%if %{WITH_AUDIT}
-Requires: audit-libs >= 1.0.8
-%endif
-%if %{WITH_SELINUX}
-Requires: libselinux >= 1.33.2
-%endif
 
 ### Build Dependencies ###
-BuildRequires: autoconf >= 2.60
+BuildRequires: audit-libs-devel
+BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gcc
 BuildRequires: gettext-devel
 BuildRequires: libdb-devel
-BuildRequires: libeconf-devel >= 0.3.5
+BuildRequires: libeconf-devel
 BuildRequires: libnsl2-devel
+BuildRequires: libselinux-devel
 BuildRequires: libtirpc-devel
 BuildRequires: libtool
-BuildRequires: libxcrypt-devel >= 4.3.3-2
+BuildRequires: libxcrypt-devel
 BuildRequires: make
 %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
 BuildRequires: openssl-devel >= 3.0.0
@@ -73,12 +60,6 @@ BuildRequires: perl-interpreter
 BuildRequires: pkgconfig
 BuildRequires: sed
 BuildRequires: systemd
-%if %{WITH_AUDIT}
-BuildRequires: audit-libs-devel >= 1.0.8
-%endif
-%if %{WITH_SELINUX}
-BuildRequires: libselinux-devel >= 1.33.2
-%endif
 
 %description
 PAM (Pluggable Authentication Modules) is a system security tool that
@@ -130,19 +111,15 @@ autoreconf -i
 
 %build
 %configure \
-	--disable-rpath \
 	--libdir=%{_pam_libdir} \
 	--includedir=%{_includedir}/security \
-	--enable-vendordir=%{_datadir} \
-%if ! %{WITH_SELINUX}
-	--disable-selinux \
-%endif
-%if ! %{WITH_AUDIT}
-	--disable-audit \
-%endif
+	--disable-rpath \
 	--disable-static \
 	--disable-prelude \
-	--enable-openssl
+	--enable-audit \
+	--enable-openssl \
+	--enable-selinux \
+	--enable-vendordir=%{_datadir}
 %make_build -C po update-gmo
 %make_build
 
@@ -158,10 +135,8 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name
 # Install the binaries, libraries, and modules.
 %make_install LDCONFIG=:
 
-%if %{WITH_SELINUX}
 # Temporary compat link
 ln -sf pam_sepermit.so $RPM_BUILD_ROOT%{_pam_moduledir}/pam_selinux_permit.so
-%endif
 
 # RPM uses docs from source tree
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/Linux-PAM
@@ -228,13 +203,9 @@ install -m644 -D modules/pam_namespace/pam_namespace.service \
 # Make sure every module subdirectory gave us a module.  Yes, this is hackish.
 for dir in modules/pam_* ; do
 if [ -d ${dir} ] ; then
-%if ! %{WITH_SELINUX}
 	[ ${dir} = "modules/pam_selinux" ] && continue
 	[ ${dir} = "modules/pam_sepermit" ] && continue
-%endif
-%if ! %{WITH_AUDIT}
 	[ ${dir} = "modules/pam_tty_audit" ] && continue
-%endif
 	if ! ls -1 $RPM_BUILD_ROOT%{_pam_moduledir}/`basename ${dir}`*.so ; then
 		echo ERROR `basename ${dir}` did not build a module.
 		exit 1
@@ -253,9 +224,9 @@ for module in $RPM_BUILD_ROOT%{_pam_moduledir}/pam*.so ; do
 	fi
 done
 
-%ldconfig_scriptlets
-
 %files -f Linux-PAM.lang
+%license Copyright
+%license gpl-2.0.txt
 %dir %{_pam_confdir}
 %dir %{_pam_vendordir}
 %config(noreplace) %{_pam_confdir}/other
@@ -266,9 +237,6 @@ done
 %config(noreplace) %{_pam_confdir}/config-util
 %config(noreplace) %{_pam_confdir}/postlogin
 %{_rpmconfigdir}/macros.d/macros.%{name}
-%{!?_licensedir:%global license %%doc}
-%license Copyright
-%license gpl-2.0.txt
 %{_pam_libdir}/libpam.so.%{so_ver}*
 %{_pam_libdir}/libpamc.so.%{so_ver}*
 %{_pam_libdir}/libpam_misc.so.%{so_ver}*
@@ -311,11 +279,9 @@ done
 %{_pam_moduledir}/pam_pwhistory.so
 %{_pam_moduledir}/pam_rhosts.so
 %{_pam_moduledir}/pam_rootok.so
-%if %{WITH_SELINUX}
 %{_pam_moduledir}/pam_selinux.so
 %{_pam_moduledir}/pam_selinux_permit.so
 %{_pam_moduledir}/pam_sepermit.so
-%endif
 %{_pam_moduledir}/pam_securetty.so
 %{_pam_moduledir}/pam_setquota.so
 %{_pam_moduledir}/pam_shells.so
@@ -323,9 +289,7 @@ done
 %{_pam_moduledir}/pam_succeed_if.so
 %{_pam_moduledir}/pam_time.so
 %{_pam_moduledir}/pam_timestamp.so
-%if %{WITH_AUDIT}
 %{_pam_moduledir}/pam_tty_audit.so
-%endif
 %{_pam_moduledir}/pam_umask.so
 %{_pam_moduledir}/pam_unix.so
 %{_pam_moduledir}/pam_unix_acct.so
@@ -357,10 +321,8 @@ done
 %dir %{_pam_secconfdir}/console.apps
 %dir %{_pam_secconfdir}/console.perms.d
 %dir /var/run/console
-%if %{WITH_SELINUX}
 %config(noreplace) %{_pam_secconfdir}/sepermit.conf
 %dir /var/run/sepermit
-%endif
 %dir /var/run/faillock
 %dir /run/motd.d
 %dir /usr/lib/motd.d
@@ -401,6 +363,9 @@ test "$FILE" != %{_sysconfdir}/authselect/fingerprint-auth && \
 exit 0
 
 %changelog
+* Wed Oct 06 2021 Björn Esser <besser82@fedoraproject.org> - 1.5.2-6
+- Remove old cruft from spec file
+
 * Thu Sep 23 2021 Björn Esser <besser82@fedoraproject.org> - 1.5.2-5
 - Rebase to pam-redhat-1.1.5
 - Drop explicit dependency on openssl, as auto-deps will pull it in