diff --git a/.gitignore b/.gitignore
index e4c777a..d3bfd55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /wheel-0.33.6.tar.gz
 /wheel-0.34.2.tar.gz
 /wheel-0.35.1.tar.gz
+/wheel-0.36.2.tar.gz
diff --git a/python-wheel.spec b/python-wheel.spec
index 5d2054b..a74b276 100644
--- a/python-wheel.spec
+++ b/python-wheel.spec
@@ -18,7 +18,7 @@
 %global python_wheeldir %{_datadir}/python-wheels
 
 Name:           python-%{pypi_name}
-Version:        0.35.1
+Version:        0.36.2
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Built-package format for Python
@@ -56,10 +56,10 @@ It has two different roles:
 %description %{_description}
 
 # Virtual provides for the packages bundled by wheel.
-# Actual version is written in src/wheel/vendored/packaging/_typing.py
-# and src/wheel/vendored/packaging/tags.py
+# Actual version can be found in git history:
+# https://github.com/pypa/wheel/commits/master/src/wheel/vendored/packaging/tags.py
 %global bundled %{expand:
-Provides:       bundled(python3dist(packaging)) = 20.4
+Provides:       bundled(python3dist(packaging)) = 20.8
 }
 
 
@@ -130,6 +130,11 @@ rm setup.cfg  # to drop pytest coverage options configured there
 %endif
 
 %changelog
+* Mon Jan 04 2021 Miro Hrončok <mhroncok@redhat.com> - 1:0.36.2-1
+- Update to 0.36.2
+- Fixes: rhbz#1907227
+- Fixes: rhbz#1899553
+
 * Thu Sep 10 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:0.35.1-1
 - Update to 0.35.1
 - Fixes: rhbz#1868821
diff --git a/sources b/sources
index 04677fc..43bb2fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wheel-0.35.1.tar.gz) = 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
+SHA512 (wheel-0.36.2.tar.gz) = 23f3dd0540ecc8e762f37a4bb69713abe99125a605c03b1a3412cec910fb7a6cea3eee3910d7c98122b276170a17414c9132b57b57a30a4ba1283cea8f9e20fa
diff --git a/tests/tests.yml b/tests/tests.yml
index 8ee0680..5655d1c 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -25,6 +25,12 @@
     - smoke38:
         dir: python/smoke
         run: VERSION=3.8 METHOD=virtualenv ./venv.sh
+    - smoke39:
+        dir: python/smoke
+        run: VERSION=3.9 METHOD=virtualenv ./venv.sh
+    - smoke310:
+        dir: python/smoke
+        run: VERSION=3.10 METHOD=virtualenv ./venv.sh
     - pyproject_pytest:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pytest
@@ -34,11 +40,13 @@
     required_packages:
     - gcc
     - virtualenv
-    - python27
-    - python35
-    - python36
-    - python37
-    - python38
+    - python2.7
+    - python3.5
+    - python3.6
+    - python3.7
+    - python3.8
+    - python3.9
+    - python3.10
     - python2-devel
     - python3-devel
     - python3-tox