diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog
index 4ee39e92..118684bc 100644
--- a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog
+++ b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Aug 2008; Mario Fetka <mario.fetka@gmail.com> -files/80novell,
+  -files/80novell64, novell-nici-2.7.3_p12.ebuild:
+  depend on env package
+
   26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
   novell-nici-2.7.2_p001.ebuild:
   correct typo
diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest
index c2fbc49d..b7ddf2f5 100644
--- a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest
+++ b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest
@@ -1,9 +1,7 @@
-AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee4b612381334b879468d9f0cc9e2a2b SHA256 1602e6f7016cd33476f398196f1061158d9f8f5e302b83911c92e013d6a7d81c
-AUX 80novell64 215 RMD160 d304cf813f3377e6fbb7b6bc4a8705590bd28afa SHA1 048891321018e5f7beb1bfc97883b9f2fa72ee6b SHA256 3806ba4709b79d940c2271af9607be295e97dd13c3bc889f95dec1a7d577f3d5
 DIST novell-client-2.0-sle10sp1-i386.iso 10866688 RMD160 b478e97de576987b0a3b801965dbddb4fc8d8ce0 SHA1 49d70ed6e7007b7e18468ec0b42bed6ac6b8702f SHA256 a6609aee78e90a5375fd698b571a015b3696d10ff2f11d085e4abf5b404a35d6
 DIST novell-client-2.0-sle10sp1-x86_64.iso 11649024 RMD160 4f3a08e9cfea2b78072ba9114ecf03b44d8da17a SHA1 f1f5c78851a66c963fef02c69d89e86a3ba12d00 SHA256 3b70e2c81ded3916771a22a5c284c0d5ac7b32b8a47207d01350f9f952fd216f
 DIST ss206_SLAH.tgz 31143941 RMD160 6dbfa508a374c2b5139cc45214e9ad1a17919791 SHA1 98916a96c7e5232a8deb3c2a9919e645f4bb1fdc SHA256 513faf240d85b189a64a1e88f9fdb08ee273c1f44e2bf0b51d9611fc9e4f3838
 EBUILD novell-nici-2.7.2_p001.ebuild 1688 RMD160 9cb6e827fd8f65800e703286cb858db81253fc2a SHA1 2170f431a15f84b90e05f527a3c66ad0ca4362e8 SHA256 1509e990a854d1edf37edb9055fb77a589bc6517b0921f5d77605a8a49cb256b
-EBUILD novell-nici-2.7.3_p12.ebuild 3676 RMD160 f2bbbdaa4223294d8e6e07ee0e8be6b776d0ad71 SHA1 cec61c35bd97bb1bfcdfabddecb1eacde97fd5e0 SHA256 369c6a030bf10728ab25f1112b357abc2be239522166590185a81abfda3ee93b
-MISC ChangeLog 2288 RMD160 d030ddb86f455b17ed5b9e59a41a7c91acdcf9eb SHA1 aa73057b4c06e63b91edca634136c61e8c252401 SHA256 f3fed4bcc0cd5572a4b634edbd8dd29190b3a082fa6a39acf397791705f96046
+EBUILD novell-nici-2.7.3_p12.ebuild 3579 RMD160 ff8c0d7da8da1398b3836df7ddc14f13e2ad4a69 SHA1 1bcdd21d9f21b515bc90fd54d060cca9b89628b3 SHA256 351253f8e39fe023eb67889b4e7245ad03f26cf1a07588054e38c0b37fb2da96
+MISC ChangeLog 2432 RMD160 aeeaba01e13dd81da2800bdcb8bd4ab7ad920765 SHA1 c9a5c066c8aef10959100f67f6f19db453178c34 SHA256 6315099b13241bdc78b293d30923c8a5729353f00af75cb0c8cf59e2231633b1
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/files/80novell b/trunk/novell4gentoo/app-crypt/novell-nici/files/80novell
deleted file mode 100644
index 5eccb250..00000000
--- a/trunk/novell4gentoo/app-crypt/novell-nici/files/80novell
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_DIR=/opt/novell
-PATH=/opt/novell/bin
-ROOTPATH=/opt/novell/bin:/opt/novell/sbin
-LDPATH=/opt/novell/lib
-PRELINK_PATH_MASK=/opt/novell/lib:/opt/novell/bin:/opt/novell/sbin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/files/80novell64 b/trunk/novell4gentoo/app-crypt/novell-nici/files/80novell64
deleted file mode 100644
index 2d8dd9e9..00000000
--- a/trunk/novell4gentoo/app-crypt/novell-nici/files/80novell64
+++ /dev/null
@@ -1,5 +0,0 @@
-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/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild
index 6335dc54..8882d126 100644
--- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild
+++ b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild
@@ -23,7 +23,8 @@ IUSE=""
 
 DEPEND=">=app-arch/p7zip-4.15"
 
-RDEPEND="virtual/libc"
+RDEPEND="virtual/libc
+	net-nds/novell-env"
 
 src_unpack() {
 	cd "${WORKDIR}"
@@ -96,14 +97,6 @@ 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() {