diff --git a/boost-qualify_keywords.patch b/boost-qualify_keywords.patch
new file mode 100644
index 0000000..9a04063
--- /dev/null
+++ b/boost-qualify_keywords.patch
@@ -0,0 +1,11 @@
+--- boost/python/detail/def_helper.hpp
++++ boost/python/detail/def_helper.hpp
+@@ -155,7 +155,7 @@
+           , T3 const&
+           , T4 const&
+           , default_call_policies
+-          , keywords<0>
++          , detail::keywords<0>
+           , char const*
+           , void(not_specified::*)()   // A function pointer type which is never an
+                                        // appropriate default implementation
diff --git a/boost.changes b/boost.changes
index 98ba0f1..bfb9f17 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 23 14:32:35 CEST 2008 - pth@suse.de
+
+- Qualify name to avoid clash (bnc#401964)
+
 -------------------------------------------------------------------
 Fri Jun 20 15:24:42 CEST 2008 - schwab@suse.de
 
diff --git a/boost.spec b/boost.spec
index 9562278..a94327d 100644
--- a/boost.spec
+++ b/boost.spec
@@ -25,7 +25,7 @@ Group:          Development/Libraries/C and C++
 Summary:        Boost C++ Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        1.34.1
-Release:        44
+Release:        45
 Source0:        %{name}_%{file_version}.tar.bz2
 Source1:        boost-rpmlintrc
 Source2:        boost_%{man_file_version}_man.tar.bz2
@@ -49,6 +49,7 @@ Patch15:        boost-CVE-2008-0171.patch
 #
 Patch16:        boost-qualify_name.patch
 Patch17:        boost-ppc-asm.patch
+Patch18:        boost-qualify_keywords.patch
 %define _prefix /usr
 
 %description
@@ -118,6 +119,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch15
 %patch16
 %patch17
+%patch18
 chmod +x configure
 #stupid build machinery copies .orig files
 find . -name \*.orig -exec rm {} +
@@ -197,11 +199,9 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 %fdupes %buildroot
 %endif
 
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig
 
 %files 
 %defattr(-, root, root, -)
@@ -222,6 +222,8 @@ find %{buildroot}%{_docdir}/boost-%{version} -name \*.py -exec chmod -x {} +
 %doc %{_mandir}/man7/*.7.gz
 
 %changelog
+* Mon Jun 23 2008 pth@suse.de
+- Qualify name to avoid clash (bnc#401964)
 * Fri Jun 20 2008 schwab@suse.de
 - Fix ppc atomic ops.
 * Thu Apr 10 2008 ro@suse.de