diff --git a/packaging/redhat_fedora/opensips.spec b/packaging/redhat_fedora/opensips.spec
index dfa8bd976d3..0ea794e670d 100644
--- a/packaging/redhat_fedora/opensips.spec
+++ b/packaging/redhat_fedora/opensips.spec
@@ -13,7 +13,11 @@
 %global _with_cachedb_redis 1
 %endif
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 21
+%if 0%{?rhel} > 6 && 0%{?rhel} < 8
+%global _with_cachedb_mongodb 1
+%endif
+
+%if 0%{?fedora} > 21
 %global _with_cachedb_mongodb 1
 %endif
 
@@ -589,17 +593,9 @@ is a trusted peer.
 %package  perl
 Summary:  Helps implement your own OpenSIPS extensions in Perl
 Group:    System Environment/Daemons
-# require perl-devel for >F7 and perl for <=F6
-BuildRequires:  perl(ExtUtils::MakeMaker)
-%if 0%{?rhel} > 0 && 0%{?rhel} < 8
-BuildRequires:  perl(ExtUtils::Embed)
-%else
-%if 0%{?rhel} == 5
-BuildRequires:  perl(ExtUtils::Embed), perl-devel
-%else
-BuildRequires:  perl(ExtUtils::Embed)
-%endif
-%endif
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-devel
+BuildRequires: perl(ExtUtils::Embed)
 Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))