diff --git a/python3.spec b/python3.spec
index 2a465f4..f173971 100644
--- a/python3.spec
+++ b/python3.spec
@@ -14,7 +14,7 @@ URL: https://www.python.org/
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
 Version: %{pybasever}.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Python
 
 
@@ -914,13 +914,15 @@ sed -i -e "s/'pyconfig.h'/'%{_pyconfig_h}'/" \
   %{buildroot}%{pylibdir}/sysconfig.py
 
 # Switch all shebangs to refer to the specific Python version.
-# This currently only covers files with .py extension
+# This currently only covers files matching ^[a-zA-Z0-9_]+\.py$,
+# so handle files named using other naming scheme separately.
 LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
   Tools/scripts/pathfix.py \
   -i "%{_bindir}/python%{pybasever}" \
-  %{buildroot}
+  %{buildroot} %{buildroot}%{pylibdir}/Tools/scripts/*-*.py \
+  %{buildroot}%{pylibdir}/Tools/pynche/{pynche,pynche.pyw}
 # not covered, also redundant and useless:
-rm %{buildroot}%{pylibdir}/Tools/scripts/2to3
+rm %{buildroot}%{pylibdir}/Tools/scripts/{2to3,idle3,pydoc3,pyvenv}
 
 
 # Remove shebang lines from .py files that aren't executable, and
@@ -1526,6 +1528,10 @@ fi
 # ======================================================
 
 %changelog
+* Wed Sep 13 2017 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.2-18
+- Fix /usr/bin/env dependency from python3-tools
+Resolves: rhbz#1482118
+
 * Wed Sep 06 2017 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.2-17
 - Include `-g` in the flags sent to the linker (LDFLAGS)
 Resolves: rhbz#1483222