diff --git a/spamassassin.spec b/spamassassin.spec
index 9f92be8..dac502f 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -5,22 +5,16 @@
 %{?!rhel:%define rhel 0}
 %{?!fedora:%define fedora 0}
 
-# Map RHEL to Fedora version
+# Define dist tags for old RHEL releases
 %if 0%{?rhel} == 4
-%define fedora 3
 %define dist .el4
 %endif
 %if 0%{?rhel} == 5
-%define fedora 6
 %define dist .el5
 %endif
 %if 0%{?rhel} == 6
-%define fedora 12
 %define dist .el6
 %endif
-%if 0%{?rhel} == 7
-%define fedora 16
-%endif
 
 # Define variables to use in conditionals
 %define option_ssl 0
@@ -32,7 +26,7 @@
 %define use_systemd 0
 
 # SSL and IPv6 (FC6+, RHEL5+)
-%if 0%{?fedora} > 5
+%if 0%{?fedora} > 5 || 0%{?rhel} >= 5
 %define option_ssl 1
 %endif
 
@@ -42,16 +36,16 @@
 %endif
 
 # Encode::Detect, not strictly required but helpful if you enable language detection (FC7+)
-%if 0%{?fedora} > 6
+%if 0%{?fedora} > 6 || 0%{?rhel} >= 6
 %define require_encode_detect 1
 %endif
 
 # Mail::DKIM by default (F11+)
-%if 0%{?fedora} >= 11
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %define dkim_deps 1
 %endif
 
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 %define use_systemd 1
 %endif