diff --git a/python-websocket-client.spec b/python-websocket-client.spec
index 3d95b09..5346515 100644
--- a/python-websocket-client.spec
+++ b/python-websocket-client.spec
@@ -1,17 +1,3 @@
-%if 0%{?fedora} || 0%{?rhel} > 7
-# Enable python3 build by default
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
-%if 0%{?rhel} > 7
-# Disable python2 build by default
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
-
 # what it's called on pypi
 %global srcname websocket_client
 # what it's imported as
@@ -27,10 +13,18 @@ the low level APIs for WebSocket. All APIs are the synchronous functions.
 
 python-websocket-client supports only hybi-13.}
 
+%if (%{defined fedora} && 0%{?fedora} < 31) || (%{defined rhel} && 0%{?rhel} < 8)
+%bcond_without  python2
+%endif
+
+%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} >= 7)
+%bcond_without  python3
+%endif
+
 
 Name:               python-%{pkgname}
 Version:            0.56.0
-Release:            2%{?dist}
+Release:            3%{?dist}
 Summary:            WebSocket client for python
 License:            BSD
 URL:                https://github.com/websocket-client/websocket-client
@@ -141,6 +135,9 @@ mv %{buildroot}%{_bindir}/wsdump.py %{buildroot}%{_bindir}/wsdump
 
 
 %changelog
+* Wed Aug 07 2019 Carl George <carl@george.computer> - 0.56.0-3
+- Disable python2 subpackage on F31+ rhbz#1738467
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild