diff --git a/boost.spec b/boost.spec
index 7832c11..259d57a 100644
--- a/boost.spec
+++ b/boost.spec
@@ -1,5 +1,3 @@
-%define cmake_build 0
-
 %define packver %(echo "%{version}" | sed -e "s/\\\./_/g")
 
 # From the version 13 of Fedora, the Boost libraries are delivered
@@ -16,7 +14,7 @@
 Summary:	Portable C++ libraries
 Name:		boost
 Version:	1.50.0
-Release:	3
+Release:	4
 License:	Boost
 Group:		Development/C++
 URL:		http://boost.org/
@@ -185,24 +183,18 @@ mkdir examples
 find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*tools*" -o -path "*example*" \) -exec cp --parents {} examples/ \;
 
 %build
-%define gcc_ver %(rpm -q --queryformat="%%{VERSION}" gcc)
-cat > ./tools/build/v2/user-config.jam << EOF
-using gcc : %gcc_ver : gcc : <cflags>"%optflags -I%{_includedir}/python%{py_ver}" <cxxflags>"%optflags -I%{_includedir}/python%{py_ver}" <linkflags>"%ldflags" ;
-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}
-./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
-	--prefix=%{_prefix} --libdir=%{_libdir} \
-	linkflags="%{ldflags} -lpython%{py_ver} -lstdc++ -lm" \
-	-sHAVE_ICU=1 \
-	link=shared threading=multi debug-symbols=off --layout=system
+%define boost_jam_common_flags %{_smp_mflags} -d2 --layout=system --toolset=gcc variant=release threading=multi optimization=speed linkflags="%{ldflags} -lpython%{py_ver}" debug-symbols=on -sHAVE_ICU=1 -sEXPAT_INCLUDE=%{_includedir} -sEXPAT_LIBPATH=%{_libdir} -sCXXFLAGS="%{optflags} -O3" link=shared runtime-link=shared
+%ifnarch %arm %mips
+%define boost_bjam bjam %{boost_jam_common_flags}
+%else
+%define boost_bjam bjam %{boost_jam_common_flags} --disable-long-double
+%endif
+./bootstrap.sh --prefix=%{_prefix} --libdir=%{_libdir}
+./%{boost_bjam} --prefix=%{_prefix} --libdir=%{_libdir}
 
 %install
 
-./b2 -d+2 -q %{?_smp_mflags} --without-mpi \
-	--prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} \
-	link=shared \
-	install
+./%{boost_bjam} --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} install
     
 # Kill any debug library versions that may show up un-invited.
 rm -f %{buildroot}%{_libdir}/*-d.* %{buildroot}%{_libdir}/*-d-mt.*