diff --git a/ebtables.spec b/ebtables.spec
index 45041a4..4e3c922 100644
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -24,7 +24,9 @@ BuildRequires:		systemd-units
 Requires(post):		systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
+%if 0%{?fedora} > 24
 Conflicts:              setup < 2.10.4-1
+%endif
 
 %description
 Ethernet bridge tables is a firewalling tool to transparently filter network
@@ -77,8 +79,10 @@ install %{SOURCE1} %{buildroot}/sbin/ebtables-save
 # move libebtc.so into the ldpath
 mv %{buildroot}/%{_lib}/ebtables/libebtc.so %{buildroot}/%{_lib}/
 
+%if 0%{?fedora} > 24
 # Remove /etc/ethertypes (now part of setup)
 rm -f %{buildroot}%{_sysconfdir}/ethertypes
+%endif
 
 %post
 %systemd_post ebtables.service
@@ -94,6 +98,9 @@ rm -f %{buildroot}%{_sysconfdir}/ethertypes
 %files
 %doc ChangeLog COPYING THANKS
 %doc %{_mandir}/man8/ebtables.8*
+%if 0%{?fedora} <= 24
+%{_sysconfdir}/ethertypes
+%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/ebtables-config
 %{_unitdir}/ebtables.service
 %{_libexecdir}/ebtables
@@ -106,7 +113,8 @@ rm -f %{buildroot}%{_sysconfdir}/ethertypes
 
 %changelog
 * Fri Jul 22 2016 Thomas Woerner <twoerner@redhat.com> - 2.0.10-21
-- /etc/ethertypes has been moved into the setup package. (RHBZ#1329256)
+- /etc/ethertypes has been moved into the setup package for F-25+.
+  (RHBZ#1329256)
 
 * Mon May  9 2016 Thomas Woerner <twoerner@redhat.com> - 2.0.10-20
 - add upstream --noflush option patch for ebtables-restore