diff --git a/python2.spec b/python2.spec
index 8989ac3..f4743c6 100644
--- a/python2.spec
+++ b/python2.spec
@@ -104,7 +104,7 @@ Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python2-docs when changing this:
 Version: 2.7.14
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -1182,10 +1182,16 @@ make EXTRA_CFLAGS="$CFLAGS" %{?_smp_mflags}
 # optimized python binary:
 if $PathFixWithThisBinary
 then
+  # pathfix.py currently only works with files matching ^[a-zA-Z0-9_]+\.py$
+  # when crawling through directories, so we handle the special cases manually
   LD_LIBRARY_PATH="$topdir/$ConfDir" ./$BinaryName \
     $topdir/Tools/scripts/pathfix.py \
-      -i "/usr/bin/env $BinaryName" \
-      $topdir
+      -i "%{_bindir}/python%{pybasever}" \
+      $topdir \
+      $topdir/Tools/pynche/pynche \
+      $topdir/Demo/pdist/{rcvs,rcsbump,rrcs} \
+      $topdir/Demo/scripts/find-uname.py \
+      $topdir/Tools/scripts/reindent-rst.py
 fi
 
 # Rebuild with new python
@@ -1962,6 +1968,9 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
+* Wed Apr 25 2018 Tomas Orsava <torsava@redhat.com> - 2.7.14-8
+- Change shebangs to the proper versioned binary
+
 * Wed Mar 14 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.14-7
 - Fix broken SSL module
 Resolves: rhbz#1555081