diff --git a/branches/experimental/app-crypt/novell-nici/ChangeLog b/branches/experimental/app-crypt/novell-nici/ChangeLog
index d815dfc..cf98dd6 100644
--- a/branches/experimental/app-crypt/novell-nici/ChangeLog
+++ b/branches/experimental/app-crypt/novell-nici/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Aug 2007; Mario Fetka <mario-fetka@gmx.at> +files/80novell64,
+  novell-nici-2.7.3_p5-r1.ebuild:
+  amd64 and multilib cleanup
+
   04 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
   +novell-nici-2.7.3_p5-r1.ebuild:
   the first package with amd64 support and the only package with multilib deps
diff --git a/branches/experimental/app-crypt/novell-nici/Manifest b/branches/experimental/app-crypt/novell-nici/Manifest
index 05dfe8e..9e64464 100644
--- a/branches/experimental/app-crypt/novell-nici/Manifest
+++ b/branches/experimental/app-crypt/novell-nici/Manifest
@@ -2,6 +2,10 @@ AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee
 MD5 1cb295c31c8b72610363844e9ccd5138 files/80novell 175
 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 files/80novell 175
 SHA256 1602e6f7016cd33476f398196f1061158d9f8f5e302b83911c92e013d6a7d81c files/80novell 175
+AUX 80novell64 215 RMD160 d304cf813f3377e6fbb7b6bc4a8705590bd28afa SHA1 048891321018e5f7beb1bfc97883b9f2fa72ee6b SHA256 3806ba4709b79d940c2271af9607be295e97dd13c3bc889f95dec1a7d577f3d5
+MD5 1042c6a1a384e99fea540ed91569750f files/80novell64 215
+RMD160 d304cf813f3377e6fbb7b6bc4a8705590bd28afa files/80novell64 215
+SHA256 3806ba4709b79d940c2271af9607be295e97dd13c3bc889f95dec1a7d577f3d5 files/80novell64 215
 DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
 DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
 DIST ss204_SLAH.tgz 30554485 RMD160 cf8088394b2380d2847315e58c332ec67196a269 SHA1 58178fbcd2aff7b609b1984bf9ad8a7fb43d786b SHA256 835bbc69905a7df74f01e4ec9d3a88db3edba34ec722eb215b94caa93f98a435
@@ -9,10 +13,10 @@ EBUILD novell-nici-2.7.2_p001.ebuild 1593 RMD160 d96ce2a8a84d393f5f59cd6bac2e65b
 MD5 2a4fbefa1b48e12d2f0e0255a1e3fa38 novell-nici-2.7.2_p001.ebuild 1593
 RMD160 d96ce2a8a84d393f5f59cd6bac2e65b1f8916982 novell-nici-2.7.2_p001.ebuild 1593
 SHA256 9fde78e3b2212b33077dcf623801ae355ce7e9c3feca9d302b39188fd1b1e261 novell-nici-2.7.2_p001.ebuild 1593
-EBUILD novell-nici-2.7.3_p5-r1.ebuild 2821 RMD160 85a770e9533de3393ed3e2416aad462c675f20c4 SHA1 7537a1cca8e82d00194871e9e5483402957cbd79 SHA256 4d716461a9c088603721fed7c716ec84bbc73618ba78a19229948f1218dd98a9
-MD5 613826f973cf0c875b5e93d46df23220 novell-nici-2.7.3_p5-r1.ebuild 2821
-RMD160 85a770e9533de3393ed3e2416aad462c675f20c4 novell-nici-2.7.3_p5-r1.ebuild 2821
-SHA256 4d716461a9c088603721fed7c716ec84bbc73618ba78a19229948f1218dd98a9 novell-nici-2.7.3_p5-r1.ebuild 2821
+EBUILD novell-nici-2.7.3_p5-r1.ebuild 2897 RMD160 31b8b94f68d419081c4a9f9f331a4a39d1d97e03 SHA1 87f2e02ddfca36ffdcd3faabc415a491b16ce009 SHA256 fd60b0649214815579a3c675920853a1c506e83a204dcdeb22205d8864d2002f
+MD5 ea6496644be14f6afe705581bae783c2 novell-nici-2.7.3_p5-r1.ebuild 2897
+RMD160 31b8b94f68d419081c4a9f9f331a4a39d1d97e03 novell-nici-2.7.3_p5-r1.ebuild 2897
+SHA256 fd60b0649214815579a3c675920853a1c506e83a204dcdeb22205d8864d2002f novell-nici-2.7.3_p5-r1.ebuild 2897
 EBUILD novell-nici-2.7.3_p5.ebuild 1858 RMD160 067c995c26d3a71b77f25e34d535c94720cea6e6 SHA1 7df0b2b97297f5201440ef2e07d17bb00fe49928 SHA256 53e5a62e5000c18d99ca6301b318b8bae7aaf3022055598cef1d4753587fe2c6
 MD5 5926a7ae659d5812332f954c1a3b886f novell-nici-2.7.3_p5.ebuild 1858
 RMD160 067c995c26d3a71b77f25e34d535c94720cea6e6 novell-nici-2.7.3_p5.ebuild 1858
diff --git a/branches/experimental/app-crypt/novell-nici/files/80novell64 b/branches/experimental/app-crypt/novell-nici/files/80novell64
new file mode 100644
index 0000000..2d8dd9e
--- /dev/null
+++ b/branches/experimental/app-crypt/novell-nici/files/80novell64
@@ -0,0 +1,5 @@
+NOVELL_DIR=/opt/novell
+PATH=/opt/novell/bin
+ROOTPATH=/opt/novell/bin:/opt/novell/sbin
+LDPATH=/opt/novell/lib64:/opt/novell/lib32
+PRELINK_PATH_MASK=/opt/novell/lib64:/opt/novell/lib32:/opt/novell/bin:/opt/novell/sbin
\ No newline at end of file
diff --git a/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild b/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild
index 73805e4..d96967a 100644
--- a/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild
+++ b/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild
@@ -79,7 +79,13 @@ src_install() {
 	doins ${WORKDIR}/${PN}-${MY_P}/var/opt/novell/nici/xmgrcfg.wks
 	dodir /var/novell
 	dosym ../opt/novell/nici /var/novell/nici
+	if use x86 
+	then
 	doenvd ${FILESDIR}/80novell
+	elif use amd64
+	then
+	doenvd ${FILESDIR}/80novell64
+	fi
 }
 
 pkg_postinst() {