diff --git a/.gitignore b/.gitignore
index 80548f6..4412ec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /zstandard-0.19.0.tar.gz
 /zstandard-0.21.0.tar.gz
 /zstandard-0.22.0.tar.gz
+/zstandard-0.25.0.tar.gz
+/zstandard-0.23.0.tar.gz
diff --git a/python-zstandard.spec b/python-zstandard.spec
index cc553f1..a25e2e7 100644
--- a/python-zstandard.spec
+++ b/python-zstandard.spec
@@ -1,21 +1,13 @@
 %bcond_without check
 
 %global pypi_name zstandard
-%if 0%{!?pytest:1}
-%global pytest %{expand:\\\
-  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
-  PATH="%{buildroot}%{_bindir}:$PATH"\\\
-  PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
-  PYTHONDONTWRITEBYTECODE=1\\\
-  /usr/bin/pytest}
-%endif
 
 %global desc This project provides Python bindings for interfacing with the Zstandard\
 compression library. A C extension and CFFI interface are provided.
 
 Name: python-%{pypi_name}
-Version: 0.22.0
-Release: 5%{?dist}
+Version: 0.23.0
+Release: 2%{?dist}
 Summary: Zstandard bindings for Python
 License: (BSD-3-Clause OR GPL-2.0-only) AND MIT
 URL: https://github.com/indygreg/python-zstandard
@@ -30,44 +22,54 @@ Summary: %{summary}
 BuildRequires: gcc
 BuildRequires: libzstd-devel
 BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: python3-cffi
 %if %{with check}
-BuildRequires: python3-pytest
+BuildRequires: python3dist(pytest)
 %endif
-Requires: libzstd%{?_isa} = 1.5.5
+# https://github.com/indygreg/python-zstandard/issues/48
+Provides: bundled(zstd) = 1.5.6
 
 %description -n python3-%{pypi_name}
 %{desc}
 
+%pyproject_extras_subpkg -n python3-%{pypi_name} cffi
+
 %prep
 %autosetup -p1 -n %{pypi_name}-%{version}
 rm -r %{pypi_name}.egg-info
 
+# RHEL 10 ships with setuptools 69 and cffi 1.16.0
+sed -i pyproject.toml -e 's/setuptools<69.0.0/setuptools/'
+
+%generate_buildrequires
+%pyproject_buildrequires -x cffi
+
 %build
-%py3_build -- --system-zstd
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files -L %{pypi_name}
 
-%if %{with check}
 %check
+%pyproject_check_import
+%if %{with check}
 mv zstandard{,.src}
 export ZSTD_SLOW_TESTS=1
-# The multi_compress_to_buffer and multi_decompress_to_buffer features are not
-# avaliable when building against system libzstd.
-# See https://github.com/indygreg/python-zstandard/blob/0.22.0/docs/installing.rst#building-against-external-libzstd
-%pytest -v -k 'not test_features'
+%pytest -v
 mv zstandard{.src,}
 %endif
 
-%files -n python3-%{pypi_name}
+%files -n python3-%{pypi_name} -f %{pyproject_files}
 %license LICENSE zstd/COPYING
 %doc README.rst
-%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
-%{python3_sitearch}/%{pypi_name}
 
 %changelog
+* Wed Dec 03 2025 Lukáš Zaoral <lzaoarl@redhat.com> - 0.23.0-2
+- bump release to have higher NVR than EPEL 10.0 (RHEL-133018)
+
+* Wed Dec 03 2025 Lukáš Zaoral <lzaoarl@redhat.com> - 0.23.0-1
+- rebase to 0.23.0, kudos to Dominik Mierzejewski from Fedora! (RHEL-133018)
+
 * Mon Nov 03 2025 Lukáš Zaoral <lzaoral@redhat.com> - 0.22.0-5
 - unretire python-ztandard (RHEL-122724)
 
diff --git a/sources b/sources
index bc2c90f..6cfc1cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstandard-0.22.0.tar.gz) = 6352586cd3eb9fd2c552a478847433a5879a4f655396186b30ec0b86325e3015c36993e4993e9fa6e92adb5118bb6f78dba1749991ec78b07a8e3646cdf414a9
+SHA512 (zstandard-0.23.0.tar.gz) = 8b408fe537b783f61451f2024250402e38892d6feb4cfb935664d7a53d6e13d7e7e7b7687256613ea189763f70ef62d513332c879f26e55b524bb5941295840c