diff --git a/trunk/novell4gentoo/kde-misc/novell-qtgui/ChangeLog b/trunk/novell4gentoo/kde-misc/novell-qtgui/ChangeLog
index 8abb822..f745427 100644
--- a/trunk/novell4gentoo/kde-misc/novell-qtgui/ChangeLog
+++ b/trunk/novell4gentoo/kde-misc/novell-qtgui/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-client,
+  -files/80novell-client64, novell-qtgui-2.0.0_p9.ebuild:
+  depend on env package
+
   26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
   -novell-qtgui-1.2.0_p323-r4.ebuild, novell-qtgui-2.0.0_p9.ebuild:
   Repoman cleanup
diff --git a/trunk/novell4gentoo/kde-misc/novell-qtgui/Manifest b/trunk/novell4gentoo/kde-misc/novell-qtgui/Manifest
index 0d0684b..36bf767 100644
--- a/trunk/novell4gentoo/kde-misc/novell-qtgui/Manifest
+++ b/trunk/novell4gentoo/kde-misc/novell-qtgui/Manifest
@@ -1,7 +1,5 @@
-AUX 80novell-client 164 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 SHA1 24062ff92599c586746073694b6410ec038cbbc1 SHA256 dafe1812e1005f625deba9bcc6e60f3623c7ddd633e584c6a4533f7836af691f
-AUX 80novell-client64 220 RMD160 8fe1dc96515fe4e0f3759c6428fecde898987840 SHA1 f3c3b7a73744944aba323d39e8f23129f328a1d7 SHA256 03376ab166cb03f7acf355ab9d4ad15b0b9b2783bf23c723d9476958f0630c46
 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-qtgui-2.0.0_p9.ebuild 4043 RMD160 49187eef78c84205fe7714c3566e33a8de318e46 SHA1 58fff75b3f936aaa8d492e5dc268871df55246b1 SHA256 bc6b31dd1fe4a19ddb14dad016af2fb2091d4d8ac822a23d65e6fc224baba50d
-MISC ChangeLog 1138 RMD160 9ecb5047079923cf4a8a728848885c0cf2709d9e SHA1 ca9e2d651e5450920e2a39cef80a02ae0c9c48c8 SHA256 d740124c0910efb450e67956193024d5c5af9a0fe0847873d9b197fe3bb21757
+EBUILD novell-qtgui-2.0.0_p9.ebuild 3941 RMD160 b68eb471a399608e88d9438a3593a1e59bc7f914 SHA1 234dfa3d410d5c8da98e717d6f7db363c6e23eda SHA256 04dcad15e5c8bf382b1dc7bed89f788704c5065d2b409b5a61b7cf063f171fca
+MISC ChangeLog 1296 RMD160 55b390a4c3da4d4e62980eb216e8135d04d04496 SHA1 a2974a915336db5141ff1f32c43a60279d24dbdd SHA256 ecd410d5e9b46f8ada218eedb9583ff74e6395e7651a848f986da6d0360b86af
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/kde-misc/novell-qtgui/files/80novell-client b/trunk/novell4gentoo/kde-misc/novell-qtgui/files/80novell-client
deleted file mode 100644
index 08d0ea8..0000000
--- a/trunk/novell4gentoo/kde-misc/novell-qtgui/files/80novell-client
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_CLIENT_DIR=/opt/novell/ncl
-PATH=/opt/novell/ncl/bin
-ROOTPATH=/opt/novell/ncl/bin
-LDPATH=/opt/novell/lib
-PRELINK_PATH_MASK=/opt/novell/lib:/opt/novell/ncl/bin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/kde-misc/novell-qtgui/files/80novell-client64 b/trunk/novell4gentoo/kde-misc/novell-qtgui/files/80novell-client64
deleted file mode 100644
index 63c59c7..0000000
--- a/trunk/novell4gentoo/kde-misc/novell-qtgui/files/80novell-client64
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_CLIENT_DIR=/opt/novell/ncl
-PATH=/opt/novell/ncl/bin
-ROOTPATH=/opt/novell/ncl/bin
-LDPATH=/opt/novell/ncl/lib32:/opt/novell/ncl/lib64
-PRELINK_PATH_MASK=/opt/novell/ncl/lib32:/opt/novell/ncl/lib64:/opt/novell/ncl/bin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/kde-misc/novell-qtgui/novell-qtgui-2.0.0_p9.ebuild b/trunk/novell4gentoo/kde-misc/novell-qtgui/novell-qtgui-2.0.0_p9.ebuild
index 3a8b771..3e1196d 100644
--- a/trunk/novell4gentoo/kde-misc/novell-qtgui/novell-qtgui-2.0.0_p9.ebuild
+++ b/trunk/novell4gentoo/kde-misc/novell-qtgui/novell-qtgui-2.0.0_p9.ebuild
@@ -26,6 +26,7 @@ DEPEND=">=app-arch/p7zip-4.15"
 
 RDEPEND="virtual/libc
 	virtual/fam
+	net-misc/novell-client-env
 	x11-libs/qt:3
 	>=net-fs/novell-novfsd-2.0.0_p29
 	>=dev-libs/expat-2.0
@@ -98,13 +99,6 @@ src_install() {
 	doins -r "${WORKDIR}"/${PN}-${MY_PV}/opt/kde3/share/icons/*
 	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*
 	dodoc "${WORKDIR}"/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
-	if use x86
-	then
-	    doenvd "${FILESDIR}"/80novell-client
-	elif use amd64
-	then
-	    doenvd "${FILESDIR}"/80novell-client64
-	fi
 }
 
 pkg_nofetch() {