diff --git a/pypy3.spec b/pypy3.spec
index bf093ac..0aa26f8 100644
--- a/pypy3.spec
+++ b/pypy3.spec
@@ -2,7 +2,7 @@
 Name:           pypy3
 Version:        %{basever}.1
 %global pyversion 3.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python 3 implementation with a Just-In-Time compiler
 
 # LGPL and another free license we'd need to ask spot about are present in some
@@ -185,14 +185,14 @@ Patch11: 011-no-faulthandler.patch
 # pypy3 can only be build with pypy2
 BuildRequires: pypy2
 # no pypy-pycparser available ATM
-%global bootstrap_python_interp pypy
+%global bootstrap_python_interp pypy2
 %else
 
 
 # pypy3 can only be build with python2
 BuildRequires: python2-devel
 BuildRequires: python2-pycparser
-%global bootstrap_python_interp python
+%global bootstrap_python_interp python2
 
 %endif
 
@@ -289,10 +289,10 @@ Build of PyPy3 with support for micro-threads for massive concurrency
 %prep
 %autosetup -n pypy3-v%{version}-src -p1 -S git
 
-# Replace /usr/local/bin/python shebangs with /usr/bin/python:
+# Replace /usr/local/bin/python or /usr/bin/env python shebangs with /usr/bin/python2 or pypy2:
 find -name "*.py" -exec \
   sed \
-    -i -e "s|/usr/local/bin/python|/usr/bin/python|" \
+    -i -r -e "s@/usr/(local/)?bin/(env )?python(2|3)?@/usr/bin/%{bootstrap_python_interp}@" \
     "{}" \
     \;
 
@@ -303,9 +303,9 @@ for f in rpython/translator/goal/bpnn.py ; do
    chmod a-x $f
 done
 
-# Replace all lib-python python shebangs with pypy
-find lib-python/%{pylibver} -name "*.py" -exec \
-  sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!/usr/bin/%{name}|' \
+# Replace all lib-python and lib_pypy python shebangs with pypy3 (those will be shipped with pypy3-libs)
+find lib-python/%{pylibver} lib_pypy -name "*.py" -exec \
+  sed -r -i '1s@^#!\s*/usr/bin.*(python|pypy).*@#!/usr/bin/%{name}@' \
     "{}" \
     \;
 
@@ -823,6 +823,9 @@ CheckPyPy %{name}-stackless
 
 
 %changelog
+* Sat Apr 14 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.1-8
+- Fix failing taskotron check
+
 * Wed Apr 11 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.1-7
 - Provide pypy3(abi) = 5.10