diff --git a/cgit.spec b/cgit.spec
index e64fbfe..5c8e31d 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -15,10 +15,12 @@
 # the *.py files in cgit are not importable python modules
 %global _python_bytecompile_extra 0
 
-# Settings for Fedora and EL > 7
-%if 0%{?fedora} || 0%{?rhel} > 7
+# Settings for Fedora and EL >= 8
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without  httpd_filesystem
 %global use_perl_interpreter    1
 %else
+%bcond_with     httpd_filesystem
 %global use_perl_interpreter    0
 %endif
 
@@ -29,13 +31,6 @@
 %bcond_without  highlight
 %endif
 
-# Older epel lacks httpd-filesystem
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without  httpd_filesystem
-%else
-%bcond_with     httpd_filesystem
-%endif
-
 Name:           cgit
 Version:        1.2.3
 Release:        5%{?dist}
@@ -229,6 +224,7 @@ make test
 - use %%{gpgverify} macro to verify tarball signature
 - use %%{build_cflags} and %%{build_ldflags}
 - preserve timestamps when running install
+- clean up & improve dist conditionals
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild