diff --git a/trunk/novell4gentoo/kde-misc/novell-ui-base/ChangeLog b/trunk/novell4gentoo/kde-misc/novell-ui-base/ChangeLog
index d3904a6..a7da7e4 100644
--- a/trunk/novell4gentoo/kde-misc/novell-ui-base/ChangeLog
+++ b/trunk/novell4gentoo/kde-misc/novell-ui-base/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-ui-base-2.0.0_p4.ebuild:
+  depend on env package
+
   26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
   -novell-ui-base-1.2.0_p323-r5.ebuild, novell-ui-base-2.0.0_p4.ebuild:
   Repoman cleanup
diff --git a/trunk/novell4gentoo/kde-misc/novell-ui-base/Manifest b/trunk/novell4gentoo/kde-misc/novell-ui-base/Manifest
index d3ecc9a..a333254 100644
--- a/trunk/novell4gentoo/kde-misc/novell-ui-base/Manifest
+++ b/trunk/novell4gentoo/kde-misc/novell-ui-base/Manifest
@@ -1,7 +1,5 @@
-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
-EBUILD novell-ui-base-2.0.0_p4.ebuild 2723 RMD160 b3f28229ae0df56900f112135c96b589c9e41a4c SHA1 2da3d50a8991c629255885a298189a9680897260 SHA256 09fbdbdb2862e9491c4344266517301c40b2709c53926e6f40bd4574b497cf28
-MISC ChangeLog 1498 RMD160 77489db7e802da963877ffc37920756431333171 SHA1 a22ea090f336686ff54f55cf5dfd36870f70cfdc SHA256 0d1d19f7019e225dfaa5c28e920a050d18a2cc36ae7fa3e5b34669f59a37d213
+EBUILD novell-ui-base-2.0.0_p4.ebuild 2627 RMD160 142c5698cb25b130870322e4fe593832936c97d8 SHA1 a17c2ef18e0089203fd54c8c0944e1bf6ab27cc8 SHA256 a5afa7a1020e817ab00c248753cab85ea7d25bbda367a0b6e05776fa8e082e66
+MISC ChangeLog 1644 RMD160 bbb40325d1af42a49a589560a48bdb8370a74efe SHA1 d9b8c1d36b305faaf954f205bb9d950b6d52d1a6 SHA256 b0b282f769fa49a8b42914f422bb7d7e53eedeac4259029f3992b465132e678c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/kde-misc/novell-ui-base/files/80novell b/trunk/novell4gentoo/kde-misc/novell-ui-base/files/80novell
deleted file mode 100644
index 5eccb25..0000000
--- a/trunk/novell4gentoo/kde-misc/novell-ui-base/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/kde-misc/novell-ui-base/files/80novell64 b/trunk/novell4gentoo/kde-misc/novell-ui-base/files/80novell64
deleted file mode 100644
index 2d8dd9e..0000000
--- a/trunk/novell4gentoo/kde-misc/novell-ui-base/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/kde-misc/novell-ui-base/novell-ui-base-2.0.0_p4.ebuild b/trunk/novell4gentoo/kde-misc/novell-ui-base/novell-ui-base-2.0.0_p4.ebuild
index b2971ec..0adeeb2 100644
--- a/trunk/novell4gentoo/kde-misc/novell-ui-base/novell-ui-base-2.0.0_p4.ebuild
+++ b/trunk/novell4gentoo/kde-misc/novell-ui-base/novell-ui-base-2.0.0_p4.ebuild
@@ -24,6 +24,7 @@ IUSE="gtk linguas_cs_CZ linguas_da_DA linguas_de_DE linguas_en_US linguas_es_ES
 DEPEND=">=app-arch/p7zip-4.15"
 
 RDEPEND="virtual/libc
+	net-nds/novell-env
 	>=sys-devel/gcc-4.1
 	net-libs/openslp"
 
@@ -59,13 +60,6 @@ src_install() {
 	into /opt/novell
 	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
 	dodoc "${WORKDIR}"/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
-	if use x86
-	then
-	    doenvd "${FILESDIR}"/80novell
-	elif use amd64
-	then
-	    doenvd "${FILESDIR}"/80novell64
-	fi
 }
 
 pkg_nofetch() {