diff --git a/boost.spec b/boost.spec
index 2d75e0c..05bfb00 100644
--- a/boost.spec
+++ b/boost.spec
@@ -48,6 +48,22 @@
 # Without --no-undefined, corresponding libraries lose their dependency on Boost.System.
 # This is totally wrong, but it's rather a CMake'ification bug.
 %define _disable_ld_no_undefined 1
+#define _disable_lto 1
+
+%define beta %{nil}
+
+%ifarch %{ix86} %{arm}
+%bcond_with numpy
+%else
+%bcond_without  numpy
+%endif
+
+# Doesn't work with dual python2/python3 bits
+%define _python_bytecompile_build 0
+
+# (tpg) save 50 MiB
+%bcond_with docs
+
 
 Summary:	Portable C++ libraries
 Name:		boost
@@ -93,6 +109,9 @@ BuildRequires:	pkgconfig(expat)
 BuildRequires:	pkgconfig(icu-uc) >= 60.1
 BuildRequires:	pkgconfig(python)
 BuildRequires:	pkgconfig(python3)
+%if %{with numpy}
+BuildRequires:  python3-numpy-devel
+%endif
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:  bzip2
 
@@ -869,18 +888,25 @@ find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*to
 cat > ./tools/build/src/user-config.jam << EOF
 using gcc : %{gcc_ver} : gcc : <cflags>"%{optflags}" <cxxflags>"%{optflags}" <linkflags>"%{ldflags}" ;
 using python : %{py3_ver} : %{_bindir}/python%{py3_ver} : %{_includedir}/python%{py3_ver}m : %{_libdir} : : : ;
-using python : %{py_ver} : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} : : : ;
+#using python : %{py_ver} : %{_bindir}/python%{py_ver} : %{_includedir}/python%{py_ver} : %{_libdir} : : : ;
 EOF
 ./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%{_prefix} --libdir=%{_libdir} --with-python=%{py_ver}
 ./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
 	--prefix=%{_prefix} --libdir=%{_libdir} \
+%ifarch %ix86
+  instruction-set=i686 \
+%endif
 %if !%{with context}
 	--without-context --without-coroutine \
+%endif
+%ifarch znver1
+  instruction-set=znver1 \
 %endif
 	linkflags="%{ldflags} -lstdc++ -lm" \
 	-sHAVE_ICU=1 \
 	python=%{py_ver} \
-	link=shared threading=multi debug-symbols=off --layout=system
+	link=shared threading=multi debug-symbols=off --layout=system \
+	python=%{py3_ver}
 
 # Taken from the Fedora .src.rpm.
 echo ============================= build Boost.Build ==================