diff --git a/0001-Remove-optional-or-unpackaged-test-deps.patch b/0001-Remove-optional-or-unpackaged-test-deps.patch
index 5e6dce3..43e7610 100644
--- a/0001-Remove-optional-or-unpackaged-test-deps.patch
+++ b/0001-Remove-optional-or-unpackaged-test-deps.patch
@@ -1,6 +1,6 @@
-From d327cba9f022992689edd30beb157e0aa0a16c11 Mon Sep 17 00:00:00 2001
+From 4612fd1b6b7f9d3fdbfad34863e5b04535bb44cc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
-Date: Mon, 13 Sep 2021 17:56:27 +0200
+Date: Wed, 8 Dec 2021 10:22:37 +0100
 Subject: [PATCH] Remove optional or unpackaged test deps
 
 ---
@@ -8,7 +8,7 @@ Subject: [PATCH] Remove optional or unpackaged test deps
  1 file changed, 10 deletions(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index 9eee792..fbe95f5 100644
+index 0bc0101..442da7a 100644
 --- a/setup.cfg
 +++ b/setup.cfg
 @@ -37,21 +37,11 @@ exclude =
@@ -27,12 +27,12 @@ index 9eee792..fbe95f5 100644
  	mock
 -	flake8-2020
  	virtualenv>=13.0.0
- 	pytest-virtualenv>=1.2.7
+ 	pytest-virtualenv>=1.2.7  # TODO: Update once man-group/pytest-plugins#188 is solved
  	wheel
 -	paver
  	pip>=19.1 # For proper file:// URLs support.
- 	jaraco.envs
+ 	jaraco.envs>=2.2
  	pytest-xdist
 -- 
-2.31.1
+2.33.1
 
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 6501ce2..74102f0 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -24,7 +24,7 @@
 
 Name:           python-setuptools
 # When updating, update the bundled libraries versions bellow!
-Version:        58.5.3
+Version:        59.6.0
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 # setuptools is MIT
@@ -78,7 +78,7 @@ execute the software that requires pkg_resources.
 Provides: bundled(python%{python3_pkgversion}dist(appdirs)) = 1.4.3
 Provides: bundled(python%{python3_pkgversion}dist(more-itertools)) = 8.8
 Provides: bundled(python%{python3_pkgversion}dist(ordered-set)) = 3.1.1
-Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 20.4
+Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 21.2
 Provides: bundled(python%{python3_pkgversion}dist(pyparsing)) = 2.2.1
 }
 
@@ -208,6 +208,11 @@ PYTHONPATH=$(pwd) %pytest --ignore=setuptools/tests/test_integration.py --ignore
 
 
 %changelog
+* Wed Dec 08 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 59.6.0-1
+- Update to 59.6.0
+- Fixes: rhbz#2023119
+- Fixes: rhbz#2031556
+
 * Wed Nov 10 2021 Karolina Surma <ksurma@redhat.com> - 58.5.3-1
 - Update to 58.5.3
 - Fixes rhbz#2016715
diff --git a/sources b/sources
index f460cfa..e4e926e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setuptools-58.5.3.tar.gz) = 84250620310ed02eec5d01577e26c30a3ab580eab7de48a954d1dc36d84b7855f8f59f0021bdbf2f20ffecabe613ca173a0394fff53c8ab692d89db8640770c8
+SHA512 (setuptools-59.6.0.tar.gz) = 25472ec7c167e07113c6645880952458969b146766b64224ec8f40dfc2a29b23e47104b63e806292ec81ee4e9dbbdc4663228f39b4412b586cba644f69b52309