diff --git a/boost.changes b/boost.changes
index 1f55b68..5985a88 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon May 24 11:54:28 UTC 2010 - bg@novell.com
+
+- disable long double support for hppa
+
+-------------------------------------------------------------------
+Thu May 20 08:14:41 UTC 2010 - bg@novell.com
+
+- openmpi does not build on hppa
+
 -------------------------------------------------------------------
 Thu Apr 29 09:45:26 UTC 2010 - pth@novell.com
 
diff --git a/boost.spec b/boost.spec
index 9d24fc2..23b970c 100644
--- a/boost.spec
+++ b/boost.spec
@@ -28,12 +28,18 @@
 # Just hardcode build_mpi to 1 as soon as openmpi builds on all
 # named architectures.
 
-%ifarch s390 s390x ia64
+%ifarch s390 s390x ia64 hppa
 %define build_mpi 0
 %else
 %define build_mpi 1
 %endif
 
+%ifarch hppa
+%define disable_long_double 1
+%else
+%define disable_long_double 0
+%endif
+
 %define most_libs libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} libboost_wave%{lib_appendix} libboost_regex%{lib_appendix}
 
 %if %build_mpi
@@ -62,7 +68,7 @@ Group:          Development/Libraries/C and C++
 Summary:        Boost C++ Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        %{ver}
-Release:        3
+Release:        4
 Source0:        %{name}_%{file_version}.tar.bz2
 Source1:        boost-rpmlintrc
 Source2:        %{name}_man_%{file_version}.tar.bz2
@@ -427,7 +433,9 @@ fi
 #if [ $J_P -gt $J_I ]; then
 #  JOBS=$J_G
 #fi
-
+%if %{disable_long_double}
+export LONG_DOUBLE_FLAGS="--disable-long-double"
+%endif
 BJAM_CONFIG="-d2 -j$JOBS -sICU_PATH=%{_prefix}"
 PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
 PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION"
@@ -464,7 +472,7 @@ EOF
 source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
 %endif
 
-%{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam cflags="%{optflags}" cxxflags="%{optflags}" stage || \
+%{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam ${LONG_DOUBLE_FLAGS} cflags="%{optflags}" cxxflags="%{optflags}" stage || \
 	(echo "Not all Boost libraries built properly."; exit 1)
 
 %if %build_docs
@@ -503,7 +511,7 @@ export PYTHON_FLAGS
 source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
 %endif
 
-%{_bindir}/bjam ${BJAM_CONFIG} --user-config=user-config.jam \
+%{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} --user-config=user-config.jam \
 	--prefix=%{buildroot}%{_prefix} \
 	--exec-prefix=$%{buildroot}%{_prefix} \
 	--libdir=%{buildroot}%{_libdir} \