diff --git a/.gitignore b/.gitignore
index c65e305..8079843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 /kombu-4.6.10.tar.gz
 /kombu-4.6.11.tar.gz
 /kombu-5.0.2.tar.gz
+/kombu-5.1.0.tar.gz
diff --git a/python-kombu.spec b/python-kombu.spec
index faf1a5f..7afc9c2 100644
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@ -1,20 +1,9 @@
-%if 0%{?rhel} && 0%{?rhel} < 8
-%bcond_with python3
-%bcond_with tests
-%else
-%bcond_without python3
 %bcond_without tests
-%endif
-
-%if %{defined el6} || %{defined el7}
-%bcond_without python2
-%endif
-
 %global srcname kombu
 
 Name:           python-%{srcname}
-Version:        5.0.2
-Release:        2%{?dist}
+Version:        5.1.0
+Release:        1%{?dist}
 Epoch:          1
 Summary:        An AMQP Messaging Framework for Python
 
@@ -35,57 +24,9 @@ The aim of Kombu is to make messaging in Python as easy as possible by
 providing an idiomatic high-level interface for the AMQP protocol, and
 also provide proven and tested solutions to common messaging problems.
 
-%if %{with python2}
-%package -n python2-%{srcname}
-Summary:        %{summary}
-Requires:       python2-amqp >= 2.5.2
-Requires:       python2-vine
-
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-
-%if %{with tests}
-# test requirements
-BuildRequires:  python2-pytest
-BuildRequires:  python2-pytest-cov
-BuildRequires:  python2-vine
-BuildRequires:  python2-case
-BuildRequires:  python2-pytz
-
-BuildRequires:  python2-nose
-
-BuildRequires:  python2-nose-cover3
-BuildRequires:  python2-coverage
-BuildRequires:  python2-mock
-BuildRequires:  python2-simplejson
-BuildRequires:  python2-pyyaml
-BuildRequires:  python2-msgpack
-BuildRequires:  python2-amqp
-# No longer packaged
-#BuildRequires:  python2-pymongo
-%endif
-
-# For documentation
-#BuildRequires:  python2-pymongo python2-sphinx
-#This causes tests error, needs fixing upstream. Incompatible with python > 2.7
-#BuildRequires:  python2-couchdb
-%{?python_provide:%python_provide python2-%{srcname}}
-
-%description -n python2-%{srcname}
-AMQP is the Advanced Message Queuing Protocol, an open standard protocol
-for message orientation, queuing, routing, reliability and security.
-
-One of the most popular implementations of AMQP is RabbitMQ.
-
-The aim of Kombu is to make messaging in Python as easy as possible by
-providing an idiomatic high-level interface for the AMQP protocol, and
-also provide proven and tested solutions to common messaging problems.
-%endif
-
-%if %{with python3}
 %package -n python3-%{srcname}
 Summary:        %{summary}
-Requires:       python3-amqp >= 5.0.1
+Requires:       python3-amqp
 Requires:       python3-vine
 
 BuildRequires:  python3-devel
@@ -94,7 +35,7 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-mock
 BuildRequires:  python3-nose-cover3
 BuildRequires:  python3-coverage
-BuildRequires:  python3-amqp >= 5.0.1
+BuildRequires:  python3-amqp
 BuildRequires:  python3-pymongo
 BuildRequires:  python3-nose
 BuildRequires:  python3-vine
@@ -103,8 +44,8 @@ BuildRequires:  python3-pytz
 BuildRequires:  python3-sqlalchemy
 BuildRequires:  python3-boto3
 BuildRequires:  python3-pytest
+BuildRequires:  python3-pyro
 %endif
-%{?python_provide:%python_provide python3-%{srcname}}
 
 %description -n python3-%{srcname}
 AMQP is the Advanced Message Queuing Protocol, an open standard protocol
@@ -115,42 +56,33 @@ One of the most popular implementations of AMQP is RabbitMQ.
 The aim of Kombu is to make messaging in Python as easy as possible by
 providing an idiomatic high-level interface for the AMQP protocol, and
 also provide proven and tested solutions to common messaging problems.
-%endif
 
 %prep
 %autosetup -n %{srcname}-%{version}
 
 %build
-%{?with_python2:%py2_build}
-%{?with_python3:%py3_build}
+%py3_build
 
 %install
-%{?with_python3:%py3_install}
-%{?with_python2:%py2_install}
+%py3_install
 
 %check
 %if %{with tests}
-# python3-pyro is outdated and FTI in Fedora, ignore pyro tests
-py.test-3 --ignore=t/unit/transport/test_pyro.py
+# python3-azure-sdk package in Fedora is incomplete for this testsuite
+%pytest --ignore=t/unit/transport/test_azureservicebus.py
 %endif
 
-%if %{with python2}
-%files -n python2-%{srcname}
-%doc AUTHORS FAQ READ* THANKS TODO examples/
-%license LICENSE
-%{python2_sitelib}/%{srcname}
-%{python2_sitelib}/%{srcname}*.egg-info
-%endif
-
-%if %{with python3}
 %files -n python3-%{srcname}
 %doc AUTHORS FAQ READ* THANKS TODO examples/
 %license LICENSE
 %{python3_sitelib}/%{srcname}
 %{python3_sitelib}/%{srcname}*.egg-info
-%endif
 
 %changelog
+* Tue May 25 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1:5.1.0-1
+- kombu 5.1.0
+- specfile cleanup
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 844330d..88b2a28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kombu-5.0.2.tar.gz) = 2ff1dfed530773ce500af4a1ad30bf66a1e5e65705f5192193714b59c12bd4c2bb69a2a716c169bd45784b8db2ad35f45226746d972df776d9b54c35b08d6e91
+SHA512 (kombu-5.1.0.tar.gz) = cffd0c4d75dfaa06f3502c8b9c15af7ee1c85206caa7e3cc837e4c072ed8cbc5433328400143f5c5a181ffa3ceaebf9a6cf63b53268ef9731118dfc088db5c31