diff --git a/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog b/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog
index 82fcf89..1f1e119 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  novell-ndscommon-8.8.5.2.10.ebuild:
+  add multilib support
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-ndscommon-8.8.5.2.10.ebuild:
   first round of edir 8.8 ebuild mods
diff --git a/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest b/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest
index f9f97fd..9b0fd7c 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest
@@ -1,6 +1,6 @@
 DIST eDir_873_linux_full.tar.gz 100502582 RMD160 c7e4ce732a2f1caec45031b4727eff71b0546e1f SHA1 5b14b89766a37cff868143e91619efa82844adb4 SHA256 609abda0346ed77cc510df60172007a5a2e9d1cb6ea70c77a0b1b44c6c9bf507
 DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc
 EBUILD novell-ndscommon-8.7.3.37.ebuild 1827 RMD160 c5ae269ed91be318eded7dfb054d4355eb876954 SHA1 11c436f7caca379cb056a5fb1a948ec901e86aa6 SHA256 8ad5fc3578e03aefef6a0cec9bf9b86792d8fbd69d7ed2fd8a68fa19d7e02f91
-EBUILD novell-ndscommon-8.8.5.2.10.ebuild 2195 RMD160 ef6c3d42d09439b8feec40371bb56d9a17f0f2cf SHA1 7b84992e09f7afe4c3de3aff93a462abb66b9ea8 SHA256 4484f815cfef71d413f888520d16ce073b6a33ad180daa466c8845cfea2c71c7
-MISC ChangeLog 2053 RMD160 32a0ea1309dd137d81e7ec774561c15bba3fd7b0 SHA1 56c9a56c3e5ccbaba07d634e8931905eb9c7c133 SHA256 3444143bb0df6c1bfbf4fdaf7e8c8f6713d782c7b49b59f57e6199347c12b1fd
+EBUILD novell-ndscommon-8.8.5.2.10.ebuild 2840 RMD160 dfb376ac489d813ea21c584c3fe830ac385efc3b SHA1 d2a9723ab11252f26d0ca4ed577cd570ed21f2ee SHA256 f5706a9f05fdaae967b30f4c5f58887d564b0e3eb0e37718cd168828172890ec
+MISC ChangeLog 2166 RMD160 ad26747b2ec39eaec6c323d0b1c91c2d87887071 SHA1 e87e32f467ca2a920f795574ac8e8a645fcb4f4a SHA256 5c0e5fbc0917f2f588fce0f5d886e755472189c313be9eeadb52e4ddd6b5946f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild b/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild
index bf6acd1..8493fe7 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild
@@ -4,8 +4,9 @@
 
 EAPI="1"
 
-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"
 
@@ -15,8 +16,9 @@ MY_PV=$(replace_version_separator 4 '-')
 
 DESCRIPTION="Novell Directory User Agent"
 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"
@@ -46,6 +48,13 @@ src_unpack() {
 	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-NDScommon.${march}.rpm
+	fi
 	rpm_unpack ../work/edir8852/${ndir}/novell-NDScommon.${narch}.rpm
 }
 
@@ -60,10 +69,22 @@ src_install() {
 
 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"