diff --git a/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog b/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog
index ff30cbe..5e07b27 100644
--- a/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-novlxis/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-novlxis-8.8.5.2.10.ebuild:
+  add multilib support
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-novlxis-8.8.5.2.10.ebuild:
   first round of edir 8.8 ebuild mods
diff --git a/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest b/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest
index 3089737..d7cf30c 100644
--- a/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-novlxis/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-novlxis-8.7.3.6.22.ebuild 1587 RMD160 546afa7ac321d72ab7bd3ae9974fee42f18bb520 SHA1 bb6a59cef3a7a659b14f75d6f4bf43b77092de7e SHA256 835d5fc9631563caf5d32ae899e990a18529129c841e1d16334aae73124f760d
-EBUILD novell-novlxis-8.8.5.2.10.ebuild 2066 RMD160 a27fe03821ea745227c274935252aaa974acf1d0 SHA1 7c83f501e87e791826bd91a04a4c25916f2a7b58 SHA256 4cce6cdfa2c4e2ef01e68cac2c2319feec3e661dc5842b9176f38547bb56ed03
-MISC ChangeLog 1843 RMD160 97d47ccb49c6c35f7c7b3b2190679e5ce2c66044 SHA1 9796a5533dac8b3304f7a8043e72e27160e7352c SHA256 5b7c859be0718ee9146caaf3087730a1c4e4b50c6313fa4df8ce521d335cebb3
+EBUILD novell-novlxis-8.8.5.2.10.ebuild 2710 RMD160 926406e766543629a0f5746329a637f995b3c60f SHA1 e405aa998f4c63e40d33d905431cf560999ce251 SHA256 2ca6774841dd90edb1f28128dc615dddbf3321096ffd4c312b90384538b9a3ed
+MISC ChangeLog 1954 RMD160 0126614e7f19713f12d62eb9303b1096d31fc3cd SHA1 f26e94108c7f42048aacef84df96cd22892c5f28 SHA256 860a1af491b2ee66f53306728df28fe6ed181f9c1ec38801bbb302ea602bca27
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.8.5.2.10.ebuild b/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.8.5.2.10.ebuild
index 17bc0bd..1b6584b 100644
--- a/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.8.5.2.10.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-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 XIS"
 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-87"
 SLOT="8.8"
@@ -29,22 +31,29 @@ DEPEND="!net-nds/novell-novlxis:0
 RDEPEND="virtual/libc"
 
 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-NOVLxis.${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-NOVLxis.${march}.rpm
+	fi
+	rpm_unpack ../work/edir8852/${ndir}/novell-NOVLxis.${narch}.rpm
 }
 
 src_compile() { :; }
@@ -52,14 +61,30 @@ src_compile() { :; }
 src_install() {
 	into /opt/novell/eDirectory
 	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
 }
 
 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"