diff --git a/texlive.spec b/texlive.spec
index ea3fdc0..5b22b1f 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -24,7 +24,7 @@
 
 Name: texlive
 Version: %{source_date}
-Release: 22%{?dist}
+Release: 23%{?dist}
 Epoch: %{tl_epoch}
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -68,6 +68,8 @@ BuildRequires: mpfr-devel
 BuildRequires: chrpath
 BuildRequires: openssl-devel
 BuildRequires: multilib-rpm-config
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 
 Requires: texlive-scheme-basic
 Requires: texlive-collection-latexrecommended
@@ -25316,8 +25318,11 @@ patch -p1 < %{_sourcedir}/texlive-20190410-tlmgr-ignore-warning.patch
 popd
 
 # adjust python3 shebang to make it point at #!%%{_python3}
-sed -i '1s=^#! /usr/bin/python3$=#!%{__python3}=' %{buildroot}%{_texdir}/texmf-dist/doc/xelatex/xepersian/*.py
-chmod 644  %{buildroot}%{_texdir}/texmf-dist/doc/xelatex/xepersian/*.py
+pushd %{buildroot}
+find -type f -exec sed -i '1s|^#!/usr/bin/python$|#!%{__python3}|' {} +
+find -type f -exec sed -i '1s|^#!/usr/bin/env python$|#!%{__python3}|' {} +
+sed -i '1s|^#!/usr/bin/python |#!%{__python3} |' ./%{_texdir}/texmf-dist/scripts/de-macro/de-macro
+popd
 
 # fix mangling shebang in scrips
 pushd  %{buildroot}%{_texdir}/texmf-dist/
@@ -28381,6 +28386,9 @@ done <<< "$list"
 %{_texdir}/texmf-dist/doc/latex/xpatch/
 
 %changelog
+* Tue Oct 19 2021 Than Ngo <than@redhat.com> - 9:20200406-23
+- Resolves: #2014453, runtime requirement on python-unversioned-command
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 9:20200406-22
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688