diff --git a/.gitignore b/.gitignore
index 7a0c623..8216dcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ gevent-0.13.0.tar.gz
 /gevent-1.3.6.tar.gz
 /gevent-1.5a3.zip
 /gevent-20.5.0.tar.gz
+/gevent-20.6.0.tar.gz
diff --git a/python-gevent.spec b/python-gevent.spec
index 5964f17..db7458c 100644
--- a/python-gevent.spec
+++ b/python-gevent.spec
@@ -3,17 +3,18 @@
 %global optflags %(echo %{optflags} -I%{_includedir}/libev)
 
 Name:          python-%{modname}
-Version:       20.5.0
-Release:       2%{?dist}
+Version:       20.6.0
+Release:       1%{?dist}
 Summary:       A coroutine-based Python networking library
 
 License:       MIT
 URL:           http://www.gevent.org/
 Source0:       %{pypi_source %{modname} %{version} tar.gz}
 
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: c-ares-devel
 BuildRequires: libev-devel
+BuildRequires: libuv-devel
 
 %description
 gevent is a coroutine-based Python networking library that uses greenlet to
@@ -33,8 +34,12 @@ Summary:       %{summary}
 %{?python_provide:%python_provide python3-%{modname}}
 BuildRequires: python3-devel
 BuildRequires: python3-Cython
-BuildRequires: python3-greenlet-devel
-Requires:      python3-greenlet
+BuildRequires: python3-greenlet-devel >= 0.4.16
+# For tests
+BuildRequires: python3-dns
+BuildRequires: python3-psutil
+BuildRequires: python3-zope-interface
+Requires:      python3-greenlet >= 0.4.16
 
 %description -n python3-%{modname}
 gevent is a coroutine-based Python networking library that uses greenlet to
@@ -61,19 +66,15 @@ rm -r deps
 sed -i -e 's/include_package_data=True/include_package_data=False/' setup.py
 
 # Force re-cythonizing the sources
-rm src/gevent/*.c src/gevent/libev/_*.c
+rm $(grep -rl '/\* Generated by Cython')
 
 %build
-export LIBEV_EMBED=0
-export CARES_EMBED=0
-export GEVENT_NO_CFFI_BUILD=1
+export GEVENTSETUP_EMBED=0
 # Build Python 3 first to use Python 3 Cython
 %py3_build
 
 %install
-export LIBEV_EMBED=0
-export CARES_EMBED=0
-export GEVENT_NO_CFFI_BUILD=1
+export GEVENTSETUP_EMBED=0
 %py3_install
 rm %{buildroot}%{python3_sitearch}/%{modname}/_*2.py
 rm %{buildroot}%{python3_sitearch}/%{modname}/__pycache__/_*2.*
@@ -81,12 +82,25 @@ find %{buildroot} -name '.buildinfo' -delete
 # Correct the permissions.
 find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 
+%check
+export PYTHONPATH=%{buildroot}%{python3_sitearch}
+%__python3 -m gevent.tests || :
+cd src/gevent/tests && GEVENT_FILE=thread %__python3 -mgevent.tests test__*subprocess*.py
+
 %files -n python3-%{modname}
 %license LICENSE
 %doc README.rst
 %{python3_sitearch}/%{modname}*
 
 %changelog
+* Sat Jun 06 2020 Orion Poplawski <orion@nwra.com> - 20.6.0-1
+- Update to 20.6.0 (bz#1840109)
+- Resolve Python 3.9 issue (bz#1838696)
+- Only remove Cython generated .c files
+- Add BR on libuv-devel
+- Use updated build variables
+- Run tests, but do not fail on them for now
+
 * Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 20.5.0-2
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index e73cd33..1018360 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gevent-20.5.0.tar.gz) = 4571a60aa9bb3dfd0e4ba361eac1b28e828eac3ed1f3fd5dcd30a8a1cc39c28bc60ed2520cfbfd1eea296ac0e081a77001811f082a8dece55f6b93d240763ae8
+SHA512 (gevent-20.6.0.tar.gz) = 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108