diff --git a/python-avocado.spec b/python-avocado.spec
index 648ef0d..84e605b 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -32,9 +32,17 @@
     %global with_tests 0
 %endif
 
+# Python2 binary packages are being removed
+# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7)
+%global with_resultsdb 1
+%else
+%global with_resultsdb 0
+%endif
+
 Name: python-%{pkgname}
 Version: 52.1
-Release: 7%{?gitrel}%{?dist}
+Release: 9%{?gitrel}%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 
 # Found licenses:
@@ -56,7 +64,6 @@ BuildArch: noarch
 BuildRequires: python2-aexpect
 BuildRequires: python2-devel
 BuildRequires: python2-mock
-BuildRequires: python2-resultsdb_api
 BuildRequires: /usr/bin/rst2man
 BuildRequires: grep, sed
 
@@ -74,6 +81,9 @@ BuildRequires: python2-fabric3
 %else
 BuildRequires: fabric
 %endif
+%if %{with_resultsdb}
+BuildRequires: python2-resultsdb_api
+%endif
 
 %if 0%{?with_tests}
 BuildRequires: perl(TAP::Parser)
@@ -99,7 +109,10 @@ BuildRequires: python-stevedore
 BuildRequires: python2-psutil
 BuildRequires: python2-requests
 BuildRequires: python2-setuptools
+%if 0%{?fedora} && 0%{?fedora} <= 30
+# python2-sphinx is no longer available or needed as of F31
 BuildRequires: python2-sphinx
+%endif
 BuildRequires: python2-stevedore
 %endif
 
@@ -240,6 +253,7 @@ Docker daemon and attaching to the container itself. Avocado must
 be previously installed on the container.
 
 
+%if %{with_resultsdb}
 %package -n python2-%{pkgname}-plugins-resultsdb
 Summary: Avocado plugin to propagate job results to ResultsDB
 %{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb}
@@ -249,6 +263,7 @@ Requires: python2-resultsdb_api
 %description -n python2-%{pkgname}-plugins-resultsdb
 Allows Avocado to send job results directly to a ResultsDB
 server.
+%endif
 
 
 %package -n python2-%{pkgname}-plugins-varianter-yaml-to-mux
@@ -310,9 +325,11 @@ popd
 pushd optional_plugins/runner_docker
     %{__python2} setup.py build
 popd
+%if %{with_resultsdb}
 pushd optional_plugins/resultsdb
     %{__python2} setup.py build
 popd
+%endif
 pushd optional_plugins/varianter_yaml_to_mux
     %{__python2} setup.py build
 popd
@@ -332,9 +349,11 @@ popd
 pushd optional_plugins/runner_docker
     %{__python2} setup.py install --root %{buildroot} --skip-build
 popd
+%if %{with_resultsdb}
 pushd optional_plugins/resultsdb
     %{__python2} setup.py install --root %{buildroot} --skip-build
 popd
+%endif
 pushd optional_plugins/varianter_yaml_to_mux
     %{__python2} setup.py install --root %{buildroot} --skip-build
 popd
@@ -370,9 +389,11 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
     pushd optional_plugins/runner_docker
         %{__python2} setup.py develop --user
     popd
+    %if %{with_resultsdb}
     pushd optional_plugins/resultsdb
         %{__python2} setup.py develop --user
     popd
+    %endif
     pushd optional_plugins/varianter_yaml_to_mux
         %{__python2} setup.py develop --user
     popd
@@ -445,9 +466,11 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
 %{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info
 
 
+%if %{with_resultsdb}
 %files -n python2-%{pkgname}-plugins-resultsdb
 %{python2_sitelib}/avocado_resultsdb/
 %{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info
+%endif
 
 
 %files -n python2-%{pkgname}-plugins-varianter-yaml-to-mux
@@ -462,6 +485,14 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
 
 
 %changelog
+* Tue Mar 19 2019 Merlin Mathesius <mmathesi@redhat.com> - 52.1-9
+- python2-sphinx is no longer available or needed as of F31
+
+* Tue Feb 05 2019 Merlin Mathesius <mmathesi@redhat.com> - 52.1-8
+- python2-resultsdb_api package has been removed in F30 as part of
+  https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+  so python2-avocado-plugins-resultsdb has also been disabled.
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild