diff --git a/caribou.spec b/caribou.spec
index 3fcdacb..ed79c48 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -25,7 +25,7 @@ BuildRequires:  libgee-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  at-spi2-core-devel
 
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
 Requires:       python2-%{name} = %{version}-%{release}
 %else
 # Changed in F23 to pull python3-caribou default
@@ -54,7 +54,7 @@ Obsoletes:      gok-devel < 2.30.1-6
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%if !0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %package     -n python3-caribou
 Summary:        Keyboard UI for %{name}
 BuildRequires:  python3-devel
@@ -87,7 +87,7 @@ This package contains caribou module for gtk3 applications.
 
 %package        antler
 Summary:        Keyboard implementation for %{name}
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
 Requires:       python2-%{name} = %{version}-%{release}
 %else
 Requires:       python3-%{name} = %{version}-%{release}
@@ -133,7 +133,7 @@ desktop-file-validate %{buildroot}%{_libdir}/gnome-settings-daemon-3.0/gtk-modul
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk-module.desktop
 %{_libexecdir}/caribou
 
-%if !0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %files -n python3-caribou
 %{python3_sitelib}/caribou
 %endif