diff --git a/nbclient-0.5.4.tar.gz b/nbclient-0.5.4.tar.gz
deleted file mode 100644
index 5a2b461..0000000
--- a/nbclient-0.5.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce
-size 70209
diff --git a/nbclient-0.5.8.tar.gz b/nbclient-0.5.8.tar.gz
new file mode 100644
index 0000000..33278be
--- /dev/null
+++ b/nbclient-0.5.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34f52cc9cb831a5d8ccd7031537e354c75dc61a24487f998712d1289de320a25
+size 74168
diff --git a/python-nbclient.changes b/python-nbclient.changes
index 786344a..a75c45a 100644
--- a/python-nbclient.changes
+++ b/python-nbclient.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sun Nov 14 13:28:35 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to version 0.5.8
+  * Prepare for use with Jupyter Releaser #175 (@davidbrochart)
+  * Move IPYKERNEL_CELL_NAME from tox to pytest #172
+    (@frenzymadness)
+  * Added CLI to README #170 (@palewire)
+  * Add "jupyter execute" command-line interface #165 (@palewire)
+  * Fix: updating buffers overwrote previous buffers #169
+    (@maartenbreddels)
+  * Fix tests for ipykernel without debugpy #166 (@frenzymadness)
+  * gitignore Pipfile #164 (@palewire)
+  * Fixed CONTRIBUTING.md link #163 (@palewire)
+  * Fix typo #162 (@The-Compiler)
+  * Move format & lint to pre-commit #161 (@chrisjsewell)
+  * Add skip-execution cell tag functionality #151 (@chrisjsewell)
+- Not enabling new jupyter-run entrypoint due to conflict with
+  jupyter_client
+
 -------------------------------------------------------------------
 Wed Sep 22 19:04:07 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-nbclient.spec b/python-nbclient.spec
index 19e46e3..29804dd 100644
--- a/python-nbclient.spec
+++ b/python-nbclient.spec
@@ -27,7 +27,7 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
 Name:           python-nbclient%{psuffix}
-Version:        0.5.4
+Version:        0.5.8
 Release:        0
 Summary:        A client library for executing notebooks
 License:        BSD-3-Clause
@@ -43,6 +43,8 @@ Requires:       python-jupyter-client >= 6.1.5
 Requires:       python-nbformat >= 5.0
 Requires:       python-nest-asyncio
 Requires:       python-traitlets >= 4.2
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
 BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module async_generator if %python-base < 3.7}
@@ -67,6 +69,8 @@ NBClient is a tool for parameterizing andexecuting Jupyter Notebooks.
 
 %prep
 %setup -q -n nbclient-%{version}
+# conflict with jupyter_client -- https://github.com/jupyter/nbclient/pull/173#issuecomment-968292909
+sed -i '/jupyter-run =/ d' setup.py
 
 %build
 %python_build
@@ -74,6 +78,7 @@ NBClient is a tool for parameterizing andexecuting Jupyter Notebooks.
 %if ! %{with test}
 %install
 %python_install
+%python_clone -a %{buildroot}%{_bindir}/jupyter-execute
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
@@ -85,11 +90,18 @@ export IPYKERNEL_CELL_NAME="<IPY-INPUT>"
 %endif
 
 %if ! %{with test}
+%post
+%python_install_alternative jupyter-execute
+
+%postun
+%python_uninstall_alternative jupyter-execute
+
 %files %{python_files}
 %doc CHANGELOG.md README.md
 %license LICENSE
+%python_alternative %{_bindir}/jupyter-execute
 %{python_sitelib}/nbclient
-%{python_sitelib}/nbclient-%{version}-py*.egg-info/
+%{python_sitelib}/nbclient-%{version}*-info/
 %endif
 
 %changelog