diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog b/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
index e9e3ab93..b69ef7b8 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  novell-nldapbase-8.8.5.2.6.ebuild:
+  add multilib support
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-nldapbase-8.8.5.2.6.ebuild:
   first round of edir 8.8 ebuild mods
diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest b/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
index 98562b27..a8520bec 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
@@ -1,6 +1,6 @@
 DIST edir87310_ftf2.tar.gz 254893129 RMD160 5db2ec018ecf7de9f3eb1e5a8ba8022e99f8cce2 SHA1 9fabfdfd807428c760942fdf49fc35b55a4b4e9a SHA256 36c657623419edb2e43b14943785d24f3d1872b4ecf5d6fc97a35792a8db3ba7
 DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc
 EBUILD novell-nldapbase-8.7.3.10.56.ebuild 2250 RMD160 a670e59da6f71c08b868672490d208806a5352f6 SHA1 5752e85ac4d6967fa27c15636ad99926004c00f3 SHA256 5c7adcff77e5e3aa17eb733dfdabe18d3af3894172d9c58de2e537ca1b66a1fa
-EBUILD novell-nldapbase-8.8.5.2.6.ebuild 3428 RMD160 cd49c3884d9ea567cedffb3cd1604b06a64cb25e SHA1 7bab16770321c39fbccbb2f783b004f56fb63d6d SHA256 3af7f35f755f44b43d8031e1bcd82b787ed29805e6f5eadc9c511c32e9ce701d
-MISC ChangeLog 2207 RMD160 8283eb4d8e7bb4f1e6210e41c24cc12c837a08f5 SHA1 d42098d8a92dad60ac2a6807455bea0b173368e1 SHA256 6669b6de52fc1b02278a705d1beffc3db11580e2c6f286293937d5e16096d200
+EBUILD novell-nldapbase-8.8.5.2.6.ebuild 3912 RMD160 39e15672f32b96146bd09c680e1b5f5901c488d1 SHA1 0988880375885f52e30cbbf1c942a1c51e9ed3e4 SHA256 0a02f6fdf7b883d369c8d8020d8b1eed79cee3445d281c3b844d2cc9d755b356
+MISC ChangeLog 2319 RMD160 9b59606090229e2ad257c91467e6ada41a76df9d SHA1 d6be64a55891201c9fcd07a00370fb22e0d92d83 SHA256 1c36910ba8d8d86a3720f6ac30dd93a96b26727b82f8dc8094bbf7d3e03574ea
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.8.5.2.6.ebuild b/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.8.5.2.6.ebuild
index 096119f2..4fb81799 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.8.5.2.6.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.8.5.2.6.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-NOVELL_BUILDID="T2wcCZC5kh4~"
+NOVELL_BUILDID32="T2wcCZC5kh4~"
 NOVELL_FILE32="patchfiles/edir885_Patch2.tar.gz"
+NOVELL_BUILDID64="T2wcCZC5kh4~"
 NOVELL_FILE64="patchfiles/edir885_Patch2.tar.gz"
 RESTRICT="mirror strip"
 
@@ -13,8 +14,9 @@ MY_PV=$(replace_version_separator 4 '-')
 
 DESCRIPTION="Novell LDAP Tools and Libraries"
 HOMEPAGE="http://www.novell.com"
-SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} )
-        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} )"
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
+	multilib? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
 
 LICENSE="Novell-eDir-88"
 SLOT="8.8"
@@ -28,33 +30,44 @@ RDEPEND="virtual/libc
 	net-nds/novell-nldapsdk:8.8"
 
 src_unpack() {
-        cd "${WORKDIR}"
-        unpack  ${A}   
-        if use x86     
-        then           
-            narch=i586 
-            nlib=lib   
-            ndir=Linux 
-        elif use amd64 
-        then           
-            narch=x86_64
-            nlib=lib64  
-            ndir=Linux64
-        fi              
-        mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-        cd ${PN}-${MY_PV}                   
-        rpm_unpack ../work/edir8852/${ndir}/novell-NLDAPbase.${narch}.rpm
-}                                                                      
+	cd "${WORKDIR}"
+	unpack  ${A}
+	if use x86
+	then
+	    narch=i586
+	    nlib=lib
+	    ndir=Linux
+	elif use amd64
+	then
+	    narch=x86_64
+	    nlib=lib64
+	    ndir=Linux64
+	fi
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	if has_multilib_profile
+	then
+	    march=i586
+	    mlib=lib
+	    mdir=Linux
+	    rpm_unpack ../work/edir8852/${mdir}/novell-NLDAPbase.${march}.rpm
+	fi
+	rpm_unpack ../work/edir8852/${ndir}/novell-NLDAPbase.${narch}.rpm
+}
 
 src_compile() { :; }
 
 src_install() {
-        into /opt/novell/eDirectory
-        dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/*
-        dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.so*
+	into /opt/novell/eDirectory
+	dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/*
+	dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.so*
+	if has_multilib_profile
+	then
+	    ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${mlib}/*.so*
+	fi
 	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*.*
 	use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fr/*/*.*
-	use linguas_fr && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/ja/*/*.*
+	use linguas_ja && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/ja/*/*.*
 	# rename conflicting man pages
 	cd "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/man/man1
 	for i in *
@@ -68,16 +81,28 @@ src_install() {
 	done
 	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/man/*/*.*
 	use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/man/fr/*/*.*
-	use linguas_fr && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/man/ja/*/*.*
+	use linguas_ja && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/man/ja/*/*.*
 
 }
 
 pkg_nofetch() {
 	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	einfo " - ${NOVELL_FILE32}"
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
+	einfo "Please download following file(s):"
+	if use x86
+	then
+	    einfo " - ${NOVELL_FILE32}"
+	    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}"
+	elif use amd64
+	then
+	    einfo " - ${NOVELL_FILE64}"
+	    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID64}"
+	    if use multilib
+	    then
+		einfo " - ${NOVELL_FILE32}"
+		einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}"
+	    fi
+	fi
+	einfo "and place them in ${DISTDIR}"
 	einfo ""
 	einfo "To get rid of downloading files from ${HOMEPAGE}"
 	einfo "you can create a file /etc/portage/novell.acc"