diff --git a/pbr-5.8.0.tar.gz b/pbr-5.8.0.tar.gz
deleted file mode 100644
index 0d650b7..0000000
--- a/pbr-5.8.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf
-size 127170
diff --git a/pbr-5.8.1.tar.gz b/pbr-5.8.1.tar.gz
new file mode 100644
index 0000000..5ed29e5
--- /dev/null
+++ b/pbr-5.8.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66bc5a34912f408bb3925bf21231cb6f59206267b7f63f3503ef865c1a292e25
+size 127537
diff --git a/python-pbr.changes b/python-pbr.changes
index 625ec68..30c345d 100644
--- a/python-pbr.changes
+++ b/python-pbr.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 22 09:04:17 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 5.8.1:
+  * Add release note about missing pbr.json fix
+  * Avoid recursive calls into SetupTools entrypoint
+  * remove explicit mock
+  * Don't test with setuptools local distutils
+  * Use context blocks for open() calls in packaging
+- remove remove_mock.patch (upstream)
+   
 -------------------------------------------------------------------
 Mon Dec  6 10:23:57 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-pbr.spec b/python-pbr.spec
index f0dc6c4..b88486d 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,15 +26,13 @@
 %bcond_with test
 %endif
 Name:           python-pbr%{psuffix}
-Version:        5.8.0
+Version:        5.8.1
 Release:        0
 Summary:        Python Build Reasonableness
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/pbr/latest/
 Source:         https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM remove_mock.patch -- https://review.opendev.org/c/openstack/pbr/+/767972 remove explicit mock
-Patch0:         remove_mock.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
diff --git a/remove_mock.patch b/remove_mock.patch
deleted file mode 100644
index a2b77bf..0000000
--- a/remove_mock.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8c4eafa33100f68bccc30575ac3113532e247f23 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Sat, 19 Dec 2020 17:07:07 +0100
-Subject: [PATCH] remove explicit mock
-
-The explicit mock package is not required if you can use unittest.mock
-from python >= 3.3
-
-Change-Id: I1e3a764b38be66b994d790768bc5eb9be4237444
----
-
-diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
-index 9e95a86..ec51146 100644
---- a/pbr/tests/test_packaging.py
-+++ b/pbr/tests/test_packaging.py
-@@ -48,7 +48,10 @@
- import textwrap
- 
- import fixtures
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import pkg_resources
- import six
- import testscenarios
-diff --git a/pbr/tests/test_pbr_json.py b/pbr/tests/test_pbr_json.py
-index f066971..eb9a08a 100644
---- a/pbr/tests/test_pbr_json.py
-+++ b/pbr/tests/test_pbr_json.py
-@@ -10,7 +10,10 @@
- # License for the specific language governing permissions and limitations
- # under the License.
- 
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- 
- from pbr import pbr_json
- from pbr.tests import base
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 4d586e4..3af261d 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -6,7 +6,6 @@
- fixtures>=3.0.0 # Apache-2.0/BSD
- hacking>=1.1.0,<4.0.0;python_version>='3.6' # Apache-2.0
- mock>=2.0.0,<4.0.0;python_version=='2.7' # BSD
--mock>=2.0.0;python_version>='3.6' # BSD
- six>=1.12.0 # MIT
- stestr>=2.1.0,<3.0;python_version=='2.7' # Apache-2.0
- stestr>=2.1.0;python_version>='3.0' # Apache-2.0