diff --git a/.gitignore b/.gitignore
index b36ef6b..0d76080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /sentencepiece-0.1.92-Source.tar.xz
 /sentencepiece-0.1.99.tar.gz
 /sentencepiece-0.2.0.tar.gz
+/sentencepiece-0.2.1.tar.gz
diff --git a/sentencepiece.spec b/sentencepiece.spec
index c2909a7..7d68fd7 100644
--- a/sentencepiece.spec
+++ b/sentencepiece.spec
@@ -1,5 +1,5 @@
 Name:		sentencepiece
-Version:	0.2.0
+Version:	0.2.1
 Release:	%autorelease
 Summary:	An unsupervised text tokenizer for Neural Network-based text generation
 
@@ -18,6 +18,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	protobuf-lite-devel
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
+BuildRequires:	python3dist(pip)
 
 %description
 The SentencePiece is an unsupervised text tokenizer for Neural Network-based
@@ -65,18 +66,17 @@ This package contains Python3 module file for SentencePiece.
 # Need some help finding the src dir now
 sed -i -e "s@'std=c++17',@'std=c++17','-I../src',@" python/setup.py
 
-# gcc 15 include cstdint
-sed -i '/#include <utility>.*/a#include <cstdint>' src/sentencepiece_processor.h
-
 %build
 %cmake \
     -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+    %{nil}
 
 %cmake_build
 
 pushd python
-%py3_build
+%pyproject_wheel
 
 popd
 
@@ -84,10 +84,12 @@ popd
 %cmake_install
 
 pushd python
-%py3_install
+%pyproject_install
+%pyproject_save_files sentencepiece
+
 popd
 
-rm %{buildroot}%{_libdir}/libsentencepiece*.a
+find %{buildroot} -name '*.a' -delete
 
 %files libs
 %doc README.md
@@ -96,16 +98,13 @@ rm %{buildroot}%{_libdir}/libsentencepiece*.a
 
 %files devel
 %{_includedir}/sentencepiece*.h
-%{_libdir}/*.so
+%{_libdir}/libsentencepiece*.so
 %{_libdir}/pkgconfig/sentencepiece*.pc
 
 %files tools
 %{_bindir}/spm*
 
-%files -n python3-%{name}
-%{python3_sitearch}/%{name}/
-%{python3_sitearch}/%{name}-*.egg-info/
-
+%files -n python3-%{name}  -f %{pyproject_files}
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index b43c0d7..59db35d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sentencepiece-0.2.0.tar.gz) = b4214f5bfbe2a0757794c792e87e7c53fda7e65b2511b37fc757f280bf9287ba59b5d630801e17de6058f8292a3c6433211917324cb3446a212a51735402e614
+SHA512 (sentencepiece-0.2.1.tar.gz) = 012850b63b2323e16acc5dacc0a494ad3f6375425ee86274f0946032e47c088a3b307758b99d752fcf54acf76c82d7d13d0c14bbf07aa9b612c4f1fbd30cf1cf