diff --git a/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog b/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog
index cb58be2..27de2fe 100644
--- a/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-novlxis/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
+  novell-novlxis-8.7.3.6_p22-r2.ebuild:
+  add new download system
+
   04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
   -novell-novlxis-8.7.3_p34.ebuild, -novell-novlxis-8.7.3.6_p22-r1.ebuild,
   -novell-novlxis-8.8.1_p7.ebuild:
diff --git a/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest b/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest
index 9d91225..8cd44b1 100644
--- a/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-novlxis/Manifest
@@ -3,14 +3,14 @@ MD5 d0a246ae85af9fc908fc1252769c2110 files/80novell-edir 303
 RMD160 64062683170df6b99c1a4c42045a6f912ac5b6c6 files/80novell-edir 303
 SHA256 adf68d10cf4426db1e1747250fc4a42408117435f2c63db38b49f9ac81c33242 files/80novell-edir 303
 DIST edir8739.tgz 253601538 RMD160 42ad5d41ddae828fcb68b94fb55b4dff738ebe5f SHA1 d359c1afa354e43a085d34332000b7977dee01e1 SHA256 4023eebaf7d8cfba661a2fa22596d95572c0d0f65b439b1c1c527e55ac934068
-EBUILD novell-novlxis-8.7.3.6_p22-r2.ebuild 738 RMD160 b5fda465c355f73aea95cde2d19b5a6868e1d841 SHA1 0364d8125c64efbc1c36738338db754270e27f1c SHA256 1bad474ea184fb901428054eb35ce1fa6b64c42a7033ba710e3429238f803aa3
-MD5 e19b0677cf0f2fcf48551e846d8c4065 novell-novlxis-8.7.3.6_p22-r2.ebuild 738
-RMD160 b5fda465c355f73aea95cde2d19b5a6868e1d841 novell-novlxis-8.7.3.6_p22-r2.ebuild 738
-SHA256 1bad474ea184fb901428054eb35ce1fa6b64c42a7033ba710e3429238f803aa3 novell-novlxis-8.7.3.6_p22-r2.ebuild 738
-MISC ChangeLog 811 RMD160 56d19e0b3757f3c14acdabfe86db8dba63f734df SHA1 43232d5d516e1e3a4195b440d184a176b56fa220 SHA256 24ce5e86a58a3e750a19553dd872e27651b002930d0aabbfca834968e8478b16
-MD5 654c644a5c75e0a760799f0d2aac6804 ChangeLog 811
-RMD160 56d19e0b3757f3c14acdabfe86db8dba63f734df ChangeLog 811
-SHA256 24ce5e86a58a3e750a19553dd872e27651b002930d0aabbfca834968e8478b16 ChangeLog 811
+EBUILD novell-novlxis-8.7.3.6_p22-r2.ebuild 1459 RMD160 a68220fdb27cf30088f665c1a5c68a69bbc161cb SHA1 222d94a1432890731b315f75214899c20101bd45 SHA256 1dd0b4eab79f3a0709ebe5c19ba7f7f17ff8333dd94c6a592888a3753db619f4
+MD5 e3e99b1dff1db855078126067a13f65d novell-novlxis-8.7.3.6_p22-r2.ebuild 1459
+RMD160 a68220fdb27cf30088f665c1a5c68a69bbc161cb novell-novlxis-8.7.3.6_p22-r2.ebuild 1459
+SHA256 1dd0b4eab79f3a0709ebe5c19ba7f7f17ff8333dd94c6a592888a3753db619f4 novell-novlxis-8.7.3.6_p22-r2.ebuild 1459
+MISC ChangeLog 926 RMD160 268142a113d518719f8fd0c9726cb7feb3613501 SHA1 0fe3b00c80113b0281716fb78665b9cbb8c6b1de SHA256 9bf5b7011ad8c68d7d1beda1ad839ba1ce4075909c13c14bc1647ed0c851f2c4
+MD5 f9a6d97fec40a99b17f58d32a0caa924 ChangeLog 926
+RMD160 268142a113d518719f8fd0c9726cb7feb3613501 ChangeLog 926
+SHA256 9bf5b7011ad8c68d7d1beda1ad839ba1ce4075909c13c14bc1647ed0c851f2c4 ChangeLog 926
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.7.3.6_p22-r2.ebuild b/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.7.3.6_p22-r2.ebuild
index d9fa16a..4aee6da 100644
--- a/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.7.3.6_p22-r2.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-novlxis/novell-novlxis-8.7.3.6_p22-r2.ebuild
@@ -2,13 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils rpm
+NOVELL_BUILDID="rla0JKRFbt4~"
+NOVELL_FILE32="patchfiles/edir8739.tgz"
+RESTRICT="mirror strip"
+
+inherit novell eutils rpm
 
 MY_PV="${PV/_p/-}"
 
 DESCRIPTION="Novell XIS"
 HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/rla0JKRFbt4~/patchfiles/edir8739.tgz"
+SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}"
 
 LICENSE="Novell-eDir-87"
 SLOT="0"
@@ -17,10 +21,7 @@ IUSE=""
 
 DEPEND=""
 
-RDEPEND="virtual/libc
-	!net-misc/novell-novlxis"
-
-RESTRICT="nomirror nostrip"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -34,4 +35,18 @@ src_compile() { :; }
 src_install() {
 	into /usr
         dolib ${WORKDIR}/${PN}-${MY_PV}/usr/lib/*
-}
\ No newline at end of file
+}
+
+pkg_nofetch() {
+    einfo "This files require you to register at ${HOMEPAGE} (free account)"
+    einfo "Please download following file:"
+    einfo " - ${NOVELL_FILE32}"
+    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
+    einfo "and place it in ${DISTDIR}"
+    einfo ""
+    einfo "To get rid of downloading files from ${HOMEPAGE}"
+    einfo "you can create a file /etc/portage/novell.acc"
+    einfo "containing the novell account infos with following commands"
+    einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
+    einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
+}