diff --git a/macros.pybytecompile b/macros.pybytecompile
index 390d4f7..f5439cf 100644
--- a/macros.pybytecompile
+++ b/macros.pybytecompile
@@ -3,9 +3,8 @@
 # Python's compile_all module only works on directories, and requires a max
 # recursion depth
 
-# Note that the py_byte_compile macro should work for python2 as well
+# Note that the py_byte_compile macro should work for all Python versions
 # Which unfortunately makes the definition more complicated than it should be
-# The condition should be reversed once /usr/bin/python is python3!
 
 %py_byte_compile()\
 py2_byte_compile () {\
@@ -21,5 +20,8 @@ py3_byte_compile () {\
     find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2], optimize=opt) for opt in range(2) for f in sys.argv[1:]]' || :\
 }\
 \
-[[ "%1" != *python3* ]] && py2_byte_compile "%1" "%2" || py3_byte_compile "%1" "%2" \
+# Get version without a dot (36 instead of 3.6), bash doesn't compare floats well \
+python_version=$(%1 -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") \
+# The bytecompilation syntax has changed between Python 3.4 and Python 3.5, so for 3.4 and earlier we use the "Python 2" syntax \
+[ "$python_version" -ge 35 ] && py3_byte_compile "%1" "%2" || py2_byte_compile "%1" "%2" \
 %{nil}
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index 545e2c3..86949e6 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3
-Release:        33%{?dist}
+Release:        34%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -71,6 +71,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 
 
 %changelog
+* Sat Jul 14 2018 Tomas Orsava <torsava@redhat.com> - 3-34
+- macros.pybytecompile: Detect Python version through sys.version_info instead
+  of guessing from the executable name
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild