diff --git a/.gitignore b/.gitignore
index 3ede48a..0d76080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /sentencepiece-0.1.84-Source.tar.xz
 /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 8214bbe..7d68fd7 100644
--- a/sentencepiece.spec
+++ b/sentencepiece.spec
@@ -1,5 +1,5 @@
 Name:		sentencepiece
-Version:	0.1.99
+Version:	0.2.1
 Release:	%autorelease
 Summary:	An unsupervised text tokenizer for Neural Network-based text generation
 
@@ -15,8 +15,10 @@ BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	gperftools-devel
 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
@@ -52,6 +54,7 @@ This package contains header files to develop a software using SentencePiece.
 %package        -n python3-%{name}
 Summary:	Python module for SentencePiece
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       python3dist(protobuf)
 %{?python_provide:%python_provide python3-%{name}}
 
 %description -n python3-%{name}
@@ -60,25 +63,33 @@ This package contains Python3 module file for SentencePiece.
 %prep
 %autosetup
 
+# Need some help finding the src dir now
+sed -i -e "s@'std=c++17',@'std=c++17','-I../src',@" python/setup.py
+
 %build
 %cmake \
     -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+    %{nil}
 
 %cmake_build
 
 pushd python
-CFLAGS="-I../src" LDFLAGS="-L../%{_vpath_builddir}/src -lsentencepiece" PKG_CONFIG_PATH="../%{_vpath_builddir}" %py3_build
+%pyproject_wheel
+
 popd
 
 %install
 %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
@@ -87,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 05e1abe..59db35d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sentencepiece-0.1.99.tar.gz) = 31dc4dc3f2ff4a7effc1ed2d6ad219bcd5d28c0bac89fdeae0336f23e93f954c597313788529e692a0d694d5fa7c3c285a485dfb84a96921efc4b49bcd465358
+SHA512 (sentencepiece-0.2.1.tar.gz) = 012850b63b2323e16acc5dacc0a494ad3f6375425ee86274f0946032e47c088a3b307758b99d752fcf54acf76c82d7d13d0c14bbf07aa9b612c4f1fbd30cf1cf