diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/ChangeLog b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/ChangeLog
index 127013d..205f6c2 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/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-xtier,
+  -files/80novell-xtier64, novell-xtier-xplat-3.1.5_p46.ebuild:
+  depend on env package
+
   26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
   novell-xtier-xplat-3.1.5_p46.ebuild:
   Repoman cleanup
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/Manifest b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/Manifest
index 57ae81f..1048fc9 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/Manifest
@@ -1,7 +1,5 @@
-AUX 80novell-xtier 183 RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 SHA1 01987259189cca71e36d1e4ee2f7c507b9ac1b9d SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3
-AUX 80novell-xtier64 235 RMD160 071cc960a1640aa0eabfeada645bd71ca0ab7d3f SHA1 c64833bb3595325b434f8fd42b13a09ba50af3af SHA256 fbcd1066d8419e61386b90583ebe08bee8370e97daa22761f8376cda81827281
 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-xtier-xplat-3.1.5_p46.ebuild 2264 RMD160 9aae0a43732cec4b0020dd45fbdab3a1c1c52e22 SHA1 c2042c97e0884a6d5fc2306ea2782930a3cace64 SHA256 ca54352e4a414bf1550170cef41f9de89e36705db29f8ebab6897caa0ceaa5a0
-MISC ChangeLog 448 RMD160 46e3371789a17df4f68bd799ea16ae37bf516a45 SHA1 fc1f6570e9ebc93458f85ac3e38304d2e8a49c10 SHA256 6930c5b99d351276096318e1337b5a8edeefbc8dceb7778a87a2efa069017e18
+EBUILD novell-xtier-xplat-3.1.5_p46.ebuild 2162 RMD160 f816d1f6ef2a7c5ae94c7bb26771cf7a7240381b SHA1 2c573005ba41506d4542ccbac55bb19b462b5a2c SHA256 d4bfaa971644012969d1d0b03e4992387a61e5539e275cc2a3c5ae00fc7fef9e
+MISC ChangeLog 611 RMD160 959da96969c319ca0b58aa8b37eb33aec4a1e951 SHA1 26b6a49c27af32bdc27c1ac44fac99e062958df2 SHA256 468d7d2d6ffa01e187082f58ef2c1b15c9c7258a8871a346af307ace8316a87d
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/files/80novell-xtier b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/files/80novell-xtier
deleted file mode 100644
index 4e576b3..0000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/files/80novell-xtier
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_XTIER_DIR=/opt/novell/xtier
-PATH=/opt/novell/xtier/bin
-ROOTPATH=/opt/novell/xtier/bin
-LDPATH=/opt/novell/xtier/lib
-PRELINK_PATH_MASK=/opt/novell/xtier/lib:/opt/novell/xtier/bin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/files/80novell-xtier64 b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/files/80novell-xtier64
deleted file mode 100644
index 17e24ef..0000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/files/80novell-xtier64
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_XTIER_DIR=/opt/novell/xtier
-PATH=/opt/novell/xtier/bin
-ROOTPATH=/opt/novell/xtier/bin
-LDPATH=/opt/novell/xtier/lib32:/opt/novell/xtier/lib64
-PRELINK_PATH_MASK=/opt/novell/xtier/lib32:/opt/novell/xtier/lib64:/opt/novell/xtier/bin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/novell-xtier-xplat-3.1.5_p46.ebuild b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/novell-xtier-xplat-3.1.5_p46.ebuild
index 2f28206..3acdd05 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-xplat/novell-xtier-xplat-3.1.5_p46.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-xplat/novell-xtier-xplat-3.1.5_p46.ebuild
@@ -24,6 +24,7 @@ IUSE=""
 DEPEND=">=app-arch/p7zip-4.15"
 
 RDEPEND="virtual/libc
+	net-nds/novell-xtier-env
 	>=sys-auth/novell-nmasclient-3.4.0_p17
 	=net-nds/novell-xtier-base-${PV}"
 
@@ -51,13 +52,6 @@ src_install() {
 	into /opt/novell/xtier/
 	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/xtier/${nlib}/*
 	dodoc "${WORKDIR}"/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
-	if use x86
-	then
-	    doenvd "${FILESDIR}"/80novell-xtier
-	elif use amd64
-	then
-	    doenvd "${FILESDIR}"/80novell-xtier64
-	fi
 }
 
 pkg_nofetch() {