diff --git a/macros.pybytecompile3.5 b/macros.pybytecompile3.5
deleted file mode 100644
index 96d1826..0000000
--- a/macros.pybytecompile3.5
+++ /dev/null
@@ -1,10 +0,0 @@
-# Note that the path could itself be a python file, or a directory
-
-# Python's compile_all module only works on directories, and requires a max
-# recursion depth
-
-%py_byte_compile()\
-python_binary="%1"\
-bytecode_compilation_path="%2"\
-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:]]' || :\
-%{nil}
diff --git a/macros.pybytecompile3.6 b/macros.pybytecompile3.6
new file mode 100644
index 0000000..96d1826
--- /dev/null
+++ b/macros.pybytecompile3.6
@@ -0,0 +1,10 @@
+# Note that the path could itself be a python file, or a directory
+
+# Python's compile_all module only works on directories, and requires a max
+# recursion depth
+
+%py_byte_compile()\
+python_binary="%1"\
+bytecode_compilation_path="%2"\
+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:]]' || :\
+%{nil}
diff --git a/python3.spec b/python3.spec
index 999f24a..573d936 100644
--- a/python3.spec
+++ b/python3.spec
@@ -2,7 +2,7 @@
 # Conditionals and other variables controlling the build
 # ======================================================
 
-# NOTES ON BOOTSTRAPING PYTHON 3.5:
+# NOTES ON BOOTSTRAPING PYTHON 3.6:
 #
 # Due to dependency cycle between Python, pip, setuptools and
 # wheel caused by the rewheel patch, one has to build in the
@@ -14,12 +14,15 @@
 # 4) python3-setuptools and python3-pip with with_rewheel set to 1
 # 5) python3 with with_rewheel set to 1
 
+# First beta prerelease
+%global prerel b1
+
 %global with_rewheel 1
 
-%global pybasever 3.5
+%global pybasever 3.6
 
 # pybasever without the dot:
-%global pyshortver 35
+%global pyshortver 36
 
 %global pylibdir %{_libdir}/python%{pybasever}
 %global dynload_dir %{pylibdir}/lib-dynload
@@ -51,7 +54,7 @@
 # now has bytecode at:
 #   foo/__pycache__/bar.cpython-35.pyc
 #   foo/__pycache__/bar.cpython-35.pyo
-%global bytecode_suffixes .cpython-35*.py?
+%global bytecode_suffixes .cpython-36*.py?
 
 # Python's configure script defines SOVERSION, and this is used in the Makefile
 # to determine INSTSONAME, the name of the libpython DSO:
@@ -111,8 +114,8 @@
 # ==================
 Summary: Version 3 of the Python programming language aka Python 3000
 Name: python3
-Version: %{pybasever}.2
-Release: 7%{?dist}
+Version: %{pybasever}.0
+Release: 0.1.%{?prerel}%{?dist}
 License: Python
 Group: Development/Languages