diff --git a/trunk/novell4gentoo/net-misc/novell-ntls/ChangeLog b/trunk/novell4gentoo/net-misc/novell-ntls/ChangeLog
index 9808d585..2a09302c 100644
--- a/trunk/novell4gentoo/net-misc/novell-ntls/ChangeLog
+++ b/trunk/novell4gentoo/net-misc/novell-ntls/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-ntls-2.0.5.0.090311.ebuild:
+  add multilib support
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-ntls-2.0.5.0.090311.ebuild:
   first round of edir 8.8 ebuild mods
diff --git a/trunk/novell4gentoo/net-misc/novell-ntls/Manifest b/trunk/novell4gentoo/net-misc/novell-ntls/Manifest
index 8248ba99..817b8a65 100644
--- a/trunk/novell4gentoo/net-misc/novell-ntls/Manifest
+++ b/trunk/novell4gentoo/net-misc/novell-ntls/Manifest
@@ -5,6 +5,6 @@ EBUILD novell-ntls-2.0.2.0_p070927-r1.ebuild 1586 RMD160 f5a14aec539cf5662e5e9b1
 EBUILD novell-ntls-2.0.2.0_p070927-r2.ebuild 1648 RMD160 0885fc77799c8ac066dbd2929798a5b6c280289b SHA1 8c1c16a4175668b49f48f49b85caa52b5368dd0e SHA256 9b75d6e2df38e245e6c158808d4935de03487e98d58735bfb9956b2465ba24b8
 EBUILD novell-ntls-2.0.2.0_p070927-r3.ebuild 1718 RMD160 0de92dfec5028ae9db4575415548073c14d8ee18 SHA1 ff744eefd5aabcdcfe88f0a9b562c4cffd699709 SHA256 0b397bd100fc392956795416d7b91c01259c2d42b39a2f017aaa42a94ac742af
 EBUILD novell-ntls-2.0.2.0_p070927-r4.ebuild 1713 RMD160 11217924825e12827c3559447af5419cfc2fc558 SHA1 dd6c298441f26c712c8929c4f7f040d9aec484bf SHA256 0ebe876f6a3ec6b495d1d4a5add02ab1d0ef2f2beb870ef7d1094d3bd39c7342
-EBUILD novell-ntls-2.0.5.0.090311.ebuild 2297 RMD160 993a2227d455fc787896cca2f8c0cfd25431a854 SHA1 11905c9e7fd78d5a1a7d28978058dce88833cea3 SHA256 87d70f18f7775849b507185a3c49cd834d93781c964ae53ec3ef7b9b3726d3b0
-MISC ChangeLog 2347 RMD160 c9b0ce4466786784c9bddc7a9075d1809408ee4e SHA1 299be8132b1e94d5da8d059f90d6ca6ee7f91ed8 SHA256 d243aa4f0c56091cc1ec25ee085b78b5b41706b803f25223363112650ab62cc9
+EBUILD novell-ntls-2.0.5.0.090311.ebuild 2972 RMD160 61fe9da3102a2e4f5775b88d6161812946a9a88a SHA1 13b84b876b38668208c31ad3da87af0a1075bd9d SHA256 f963fafb6300e86cb8f7ba3265a97790440eefc30b0cafec19ec6a9761a046d1
+MISC ChangeLog 2459 RMD160 8a0f32fbc52b8dcce15a1b9ff7216ab50cf5fae2 SHA1 d1ebe25b3b7c45208cff1f2e1844e1a6cf5f7d01 SHA256 c38ef85bb236937595cca88d233aa2ed95148b622e4063d0f28b6cf3fa726120
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-misc/novell-ntls/novell-ntls-2.0.5.0.090311.ebuild b/trunk/novell4gentoo/net-misc/novell-ntls/novell-ntls-2.0.5.0.090311.ebuild
index 219ac63c..1c7f42b3 100644
--- a/trunk/novell4gentoo/net-misc/novell-ntls/novell-ntls-2.0.5.0.090311.ebuild
+++ b/trunk/novell4gentoo/net-misc/novell-ntls/novell-ntls-2.0.5.0.090311.ebuild
@@ -18,12 +18,13 @@ MY_PV=$(replace_version_separator 4 '-')
 DESCRIPTION="Novell Transport Security Layer"
 HOMEPAGE="http://www.novell.com"
 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"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="multilib"
 
 DEPEND="!net-misc/novell-ntls:0
 	!net-misc/novell-ntls:8.7"
@@ -33,22 +34,29 @@ RDEPEND="virtual/libc
 	>=app-crypt/novell-nici-2.7.3_p001"
 
 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/eDirectory/setup/novell-ntls-${MY_PV}.${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/eDirectory/setup/novell-ntls-${MY_PV}.${march}.rpm
+	fi
+	rpm_unpack ../work/eDirectory/setup/novell-ntls-${MY_PV}.${narch}.rpm
 }
 
 src_compile() { :; }
@@ -57,14 +65,31 @@ src_install() {
 	into /opt/novell
 	dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
 	dosym /opt/novell/$(get_libdir)/libntls.so /usr/$(get_libdir)/libntls.so
+	if has_multilib_profile
+	then
+	    ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.so*
+	    ABI="x86" dosym /opt/novell/$(get_libdir)/libntls.so /usr/$(get_libdir)/libntls.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"