diff --git a/python-avocado.spec b/python-avocado.spec
index e0ad788..6e78cb2 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -34,11 +34,15 @@
     %global with_tests 0
 %endif
 
-%bcond_without python2
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
+%if 0%{?fedora} > 30 || 0%{?rhel} > 7
+    %bcond_with    python2
 %else
-%bcond_with python3
+    %bcond_without python2
+%endif
+%if 0%{?fedora} || 0%{?rhel} > 7
+    %bcond_without python3
+%else
+    %bcond_with    python3
 %endif
 
 # Python 3 version of Fabric package is new starting with Fedora 29
@@ -59,7 +63,7 @@
 
 Name: python-%{pkgname}
 Version: 69.0
-Release: 2%{?gitrel}%{?dist}
+Release: 3%{?gitrel}%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 Group: Development/Tools
 # Found licenses:
@@ -1129,6 +1133,9 @@ Again Shell code (and possibly other similar shells).
 
 
 %changelog
+* Fri May 17 2019 Merlin Mathesius <mmathesi@redhat.com> - 69.0-3
+- Drop Python 2 support from F31 and RHEL8 onward.
+
 * Tue Mar 19 2019 Merlin Mathesius <mmathesi@redhat.com> - 69.0-2
 - python2-sphinx is no longer available or needed as of F31