diff --git a/nodejs.spec b/nodejs.spec
index 3c4fd43..250e1c7 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -14,7 +14,7 @@
 # This is used by both the nodejs package and the npm subpackage thar
 # has a separate version - the name is special so that rpmdev-bumpspec
 # will bump this rather than adding .1 to the end.
-%global baserelease 1
+%global baserelease 2
 
 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -77,7 +77,7 @@
 %global nghttp3_major 0
 %global nghttp3_minor 1
 %global nghttp3_patch 0-DEV
-%global nghttp3_version %{nghttp3_major}.%{nghttp3_minor}.%{nghttp3_patch} 
+%global nghttp3_version %{nghttp3_major}.%{nghttp3_minor}.%{nghttp3_patch}
 
 # ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h
 %global ngtcp2_major 0
@@ -353,7 +353,6 @@ rm -rf deps/brotli
 pathfix.py -i %{__python3} -pn $(find -type f ! -name "*.js")
 find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python3~" {} \;
 find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python3~" {} \;
-sed -i "s~python~python3~" $(find . -type f | grep "gyp$")
 sed -i "s~usr\/bin\/python2~usr\/bin\/python3~" ./deps/v8/tools/gen-inlining-tests.py
 sed -i "s~usr\/bin\/python.*$~usr\/bin\/python3~" ./deps/v8/tools/mb/mb_unittest.py
 find . -type f -exec sed -i "s~python -c~python3 -c~" {} \;
@@ -369,6 +368,7 @@ find . -type f -exec sed -i "s~python -c~python3 -c~" {} \;
 
 export CC='gcc'
 export CXX='g++'
+%{?with_python3_fixup:export NODE_GYP_FORCE_PYTHON=%{__python3}}
 
 # build with debugging symbols and add defines from libuv (#892601)
 # Node's v8 breaks with GCC 6 because of incorrect usage of methods on
@@ -679,6 +679,13 @@ end
 
 
 %changelog
+* Mon Aug 30 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.7.0-2
+- Resolves CVE-2021-22930, CVE-2021-22931, CVE-2021-22939,
+- CVE-2021-22940, CVE-2021-32803, CVE-2021-32804, CVE-2021-3672
+- Resolves: RHBZ#1988608, RHBZ#1993816, RHBZ#1993810
+- Resolves: RHBZ#1993097, RHBZ#1993948, RHBZ#1993941, RHBZ#1994963
+- fix python3 in gyp
+
 * Wed Aug 18 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.7.0-1
 - Resolves CVE-2021-22930, CVE-2021-22931, CVE-2021-22939,
 - CVE-2021-22940, CVE-2021-32803, CVE-2021-32804, CVE-2021-3672