diff --git a/iptables.spec b/iptables.spec
index c88a78b..dafc05a 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -15,7 +15,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.4.12.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -134,7 +134,7 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 if [ $1 -eq 1 ] ; then # Initial installation
    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%if 0%{?fedora} > 16
+%if 0%{?fedora} < 17 && 0%{?rhel} < 7
    /bin/systemctl enable iptables.service >/dev/null 2>&1 || :
    /bin/systemctl enable ip6tables.service >/dev/null 2>&1 || :
 %endif
@@ -161,7 +161,7 @@ fi
 %{_bindir}/systemd-sysv-convert --save iptables >/dev/null 2>&1 ||:
 
 # Autostart
-%if 0%{?fedora} > 16
+%if 0%{?fedora} < 17 && 0%{?rhel} < 7
 /bin/systemctl --no-reload enable iptables.service >/dev/null 2>&1 ||:
 %endif
 
@@ -174,7 +174,7 @@ fi
 %{_bindir}/systemd-sysv-convert --save ip6tables >/dev/null 2>&1 ||:
 
 # Autostart
-%if 0%{?fedora} > 16
+%if 0%{?fedora} < 17 && 0%{?rhel} < 7
 /bin/systemctl --no-reload enable ip6tables.service >/dev/null 2>&1 ||:
 %endif
 
@@ -249,6 +249,9 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Thu Feb 16 2012 Thomas Woerner <twoerner@redhat.com> 1.4.12.2-3
+- fixed auto enable check for Fedora > 16 and added rhel > 6 check
+
 * Wed Feb 15 2012 Thomas Woerner <twoerner@redhat.com> 1.4.12.2-2
 - disabled autostart and auto enable for iptables.service and ip6tables.service
   for Fedora > 16