diff --git a/bacula.spec b/bacula.spec
index 8918c92..e4ee5f1 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -62,7 +62,7 @@ BuildRequires:          tcp_wrappers-devel
 BuildRequires:          tcp_wrappers
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:          systemd-units
 %endif
 
@@ -426,7 +426,7 @@ install -p -m 644 -D scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconf
 install -p -m 644 -D scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
 install -p -m 755 -D %{SOURCE19}  %{buildroot}%{_sbindir}/bacula-checkconf
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} >= 7
 # Systemd unit files
 mkdir -p %{buildroot}%{_unitdir}
 install -p -m 755 -D %{SOURCE10} %{buildroot}%{_unitdir}/bacula-fd.service
@@ -676,7 +676,7 @@ fi
 
 %endif
 
-%if 0%{?rhel} == 6
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
 
 %post client
 /sbin/chkconfig --add bacula-fd
@@ -779,7 +779,7 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
 %{_sysconfdir}/logwatch/scripts/services/bacula
 %{_sysconfdir}/logwatch/scripts/shared/applybaculadate
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/bacula-dir.service
 %else
 %{_initrddir}/bacula-dir
@@ -831,7 +831,7 @@ fi
 %{_sbindir}/btape
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/bacula-sd.service
 %else
 %{_initrddir}/bacula-sd
@@ -850,7 +850,7 @@ fi
 %files client
 %defattr(-,root,root,-)
 %{_sbindir}/bacula-fd
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/bacula-fd.service
 %else
 %{_initrddir}/bacula-fd