diff --git a/SOURCES/macros.python3.5 b/SOURCES/macros.python3.5
index 1934b7e..a1aaad3 100644
--- a/SOURCES/macros.python3.5
+++ b/SOURCES/macros.python3.5
@@ -1,16 +1,19 @@
-%__python35u /usr/bin/python3.5
-%python35u_sitelib %(%{__python35u} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%python35u_sitearch %(%{__python35u} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
-%python35u_version %(%{__python35u} -c "import sys; sys.stdout.write(sys.version[:3])")
-%python35u_version_nodots %(%{__python35u} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
-%py35udir %{_builddir}/python35u-%{name}-%{version}-%{release}
+%__python35 /usr/bin/python3.5
+%python35_sitelib %(%{__python35} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%python35_sitearch %(%{__python35} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
+%python35_version %(%{__python35} -c "import sys; sys.stdout.write(sys.version[:3])")
+%python35_version_nodots %(%{__python35} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
+%py35dir %{_builddir}/python35-%{name}-%{version}-%{release}
 
-%py35u_shbang_opts -s
+%py35_shbang_opts -s
 
-%py35u_build() %{expand:\
-CFLAGS="%{optflags}" %{__python35u} setup.py %{?py_setup_args} build --executable="%{__python35u} %{py35u_shbang_opts}" %{?1}\
+# Use the slashes after expand so that the command starts on the same line as
+# the macro
+%py35_build() %{expand:\\\
+  CFLAGS="%{optflags}" %{__python35} setup.py %{?py_setup_args} build --executable="%{__python35} %{py35_shbang_opts}" %{?*}
+  sleep 1
 }
 
-%py35u_install() %{expand:\
-CFLAGS="%{optflags}" %{__python35u} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\
+%py35_install() %{expand:\\\
+  CFLAGS="%{optflags}" %{__python35} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
 }
diff --git a/SPECS/python35u.spec b/SPECS/python35u.spec
index 2841f77..441d890 100644
--- a/SPECS/python35u.spec
+++ b/SPECS/python35u.spec
@@ -181,8 +181,8 @@ Source1: find-provides-without-python-sonames.sh
 %global _use_internal_dependency_generator 0
 %global __find_provides %{SOURCE1}
 
-# Supply various useful macros for building python 3.5 modules:
-#  __python35u, python35u_sitelib, python35u_sitearch
+# Supply various useful macros for building python 3.X modules:
+#  __python3X, python3X_sitelib, python3X_sitearch
 Source2: macros.python%{pybasever}
 
 # Supply an RPM macro "py_byte_compile" for the python3-devel subpackage
@@ -1513,6 +1513,7 @@ CheckPython optimized
 - Run autotools (autoconf268) to generate the configure script before building (Fedora)
 - Use bundled expat on EL6
 - Drop unnecessary db4 build requirement
+- Update macros.python3.5 to align with python36u
 
 * Tue Aug 08 2017 Ben Harper <ben.harper@rackspace.com> - 3.5.4-1.ius
 - Latest upstream