diff --git a/boost.changes b/boost.changes
index 1dc267a..d6eb226 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 23 16:13:56 CEST 2008 - ro@suse.de
+
+- fix regexp for short symlinks
+- hook all mpi related parts to build_mpi macro
+- disable build_mpi on ia64 s390 s390x for the moment 
+
 -------------------------------------------------------------------
 Fri Oct 17 12:18:16 CEST 2008 - pth@suse.de
 
diff --git a/boost.spec b/boost.spec
index 17ab5e6..acf2c85 100644
--- a/boost.spec
+++ b/boost.spec
@@ -25,7 +25,13 @@ Name:           boost
 %define short_version    1_36
 %define gcc_version      43
 BuildRequires:  boost-jam >= 3.1.16 dos2unix gcc-c++ libbz2-devel libicu-devel python-devel xorg-x11-devel
-BuildRequires:  libexpat-devel openmpi-devel
+BuildRequires:  libexpat-devel
+%ifnarch ia64 s390 s390x
+%define build_mpi 1
+BuildRequires:  openmpi-devel
+%else
+%define build_mpi 0
+%endif
 %if 0%suse_version > 1020
 BuildRequires:  fdupes
 %endif
@@ -35,7 +41,7 @@ Group:          Development/Libraries/C and C++
 Summary:        Boost C++ Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        1.36.0
-Release:        3
+Release:        4
 Source0:        %{name}_%{file_version}.tar.bz2
 Source1:        boost-rpmlintrc
 Source2:        boost_%{man_file_version}_man.tar.bz2
@@ -180,6 +186,8 @@ This package contains the Boost::Math Runtime libraries.
 
 
 
+%if %build_mpi
+
 %package        -n libboost_mpi-gcc43-mt-1_36-1_36_0
 License:        BSD 3-Clause
 Summary:        Boost::MPI Runtime libraries
@@ -192,6 +200,8 @@ This package contains the Boost::MPI Runtime libraries.
 
 
 
+%endif
+
 %package        -n libboost_test-gcc43-mt-1_36-1_36_0
 License:        BSD 3-Clause
 Summary:        Boost::Test Runtime Libraries
@@ -330,7 +340,9 @@ REGEX_FLAGS="--with-icu"
 #BJAM_TARGET=rpm
 export EXPAT_INCLUDE=/usr/include EXPAT_LIBPATH=%{_libdir}
 BJAM_CONFIG="%bjam_config" BJAM_TARGET="$BJAM_TARGET" ./configure $BUILD_FLAGS $PYTHON_FLAGS $REGEX_FLAGS
+%if %build_mpi
 echo "using mpi ;" >> user-config.jam
+%endif
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated"
 make all
 
@@ -346,8 +358,8 @@ done;
 cd stage/lib
 for lib in $(find . -follow -name \*-gcc??-mt-%{short_version}.so); do
   NAME=${lib}.%{version}
-  SONAME_MT=$(echo $lib | sed -e 's/-gcc??-mt-%{short_version}/-mt/g')
-  SONAME=$(echo $lib | sed -e 's/-gcc??-mt-%{short_version}//g')
+  SONAME_MT=$(echo $lib | sed -e 's/-gcc..-mt-%{short_version}/-mt/g')
+  SONAME=$(echo $lib | sed -e 's/-gcc..-mt-%{short_version}//g')
   rm $lib
   ln -sf $NAME $SONAME_MT
   ln -sf $NAME $SONAME
@@ -414,8 +426,10 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 %post -n libboost_thread-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig
 
 %post -n libboost_math-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig 
+%if %build_mpi
 
 %post -n libboost_mpi-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig       
+%endif
 
 %post -n libboost_graph-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig     
 
@@ -444,8 +458,10 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 %postun -n libboost_thread-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig
 
 %postun -n libboost_math-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig
+%if %build_mpi
 
 %postun -n libboost_mpi-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig
+%endif
 
 %postun -n libboost_graph-gcc43-mt-1_36-1_36_0 -p /sbin/ldconfig
 
@@ -480,6 +496,7 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 %files -n libboost_math-gcc43-mt-1_36-1_36_0
 %defattr(-, root, root, -)
 %{_libdir}/libboost_math_*.so.*
+%if %build_mpi
 
 %files -n libboost_mpi-gcc43-mt-1_36-1_36_0
 %defattr(-, root, root, -)
@@ -487,6 +504,7 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 #%{_libdir}/libboost_mpi*.so
 #%{_libdir}/mpi*.so.%{version}
 #%{_libdir}/mpi*.so
+%endif
 
 %files -n libboost_test-gcc43-mt-1_36-1_36_0
 %defattr(-, root, root, -)
@@ -538,6 +556,10 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 %doc %{_mandir}/man7/*.7.gz
 
 %changelog
+* Thu Oct 23 2008 ro@suse.de
+- fix regexp for short symlinks
+- hook all mpi related parts to build_mpi macro
+- disable build_mpi on ia64 s390 s390x for the moment
 * Fri Oct 17 2008 pth@suse.de
 - Using a rpm macros in package name doesn't work with autobuild.
 * Wed Oct 15 2008 pth@suse.de