--- openoffice-bin-2.0.0_rc1.ebuild	2005-09-27 21:43:26.000000000 +0200
+++ openoffice-bin-2.0.0_rc1-r1.ebuild	2005-10-02 13:14:44.000000000 +0200
@@ -6,7 +6,6 @@
 
 IUSE="gnome java kde"
 
-INSTDIR="/usr/lib/openoffice"
 MY_PV="${PV/_}"
 MY_PV2="${MY_PV}_050923"
 MY_PV3="${PV/_rc1}"
@@ -121,6 +120,14 @@
 
 src_install () {
 
+	if use x86 ; then
+		INSTDIR="/usr/lib/openoffice"
+	fi
+	
+	if use amd64 ; then
+		INSTDIR="/usr/lib32/openoffice"
+	fi
+	
 	einfo "Installing OpenOffice.org into build root..."
 	dodir ${INSTDIR}
 	dodir /usr/share/icons
@@ -142,6 +149,9 @@
 	done
 
 	# Install wrapper script
+	if use amd64 ; then
+		sed -i -e 's/lib/lib32/g' ${FILESDIR}/${MY_PV3}/ooo-wrapper2
+	fi
 	newbin ${FILESDIR}/${MY_PV3}/ooo-wrapper2 ooffice2
 	sed -i -e s/PV/${PV}/g ${D}/usr/bin/ooffice2 || die