diff --git a/libbonobo-2.13.1-multishlib.patch b/libbonobo-2.13.1-multishlib.patch
index 595c1af..6f9963b 100644
--- a/libbonobo-2.13.1-multishlib.patch
+++ b/libbonobo-2.13.1-multishlib.patch
@@ -1,15 +1,27 @@
---- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2006-01-18 18:42:26.000000000 -0500
-+++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-18 18:43:24.000000000 -0500
-@@ -6,13 +6,19 @@
+--- libbonobo-2.13.1/configure.in.multishlib	2006-01-25 16:38:53.000000000 -0500
++++ libbonobo-2.13.1/configure.in	2006-01-25 16:46:03.000000000 -0500
+@@ -233,6 +233,8 @@
+ AC_SUBST(IF_BSD_PS)
+ AC_SUBST(IF_POSIX_PS)
+ 
++AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "$libdir" != "$exec_prefix/lib")
++
+ AC_OUTPUT([
+ Makefile
+ libbonobo-zip
+--- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2005-07-04 18:05:49.000000000 -0400
++++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-25 16:44:26.000000000 -0500
+@@ -6,13 +6,20 @@
  libexec_PROGRAMS=bonobo-activation-server
  noinst_PROGRAMS=test-performance
  
 +serverinfolibdir = $(libdir)/bonobo/servers
 +
-+ifneq ($(libdir), $(exec_prefix)/lib)
-+serverinfolibdir := $(serverinfolibdir):$(exec_prefix)/lib/bonobo/servers
++if MULTILIB_SERVER_FILES
++	serverinfolibdir := $(exec_prefix)/lib/bonobo/servers
 +endif
 +
++
  INCLUDES=					\
  	-I$(top_srcdir) 			\
  	-I$(top_builddir) 			\
diff --git a/libbonobo.spec b/libbonobo.spec
index a7d0330..ca2cb47 100644
--- a/libbonobo.spec
+++ b/libbonobo.spec
@@ -49,6 +49,7 @@ use Bonobo.
 %patch0 -p1 -b .multishlib
 
 %build
+intltoolize -f
 aclocal
 automake
 autoconf