diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog b/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
index 1b0a713..b600ed5 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/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-nldapbase-8.7.3.9_p54-r1.ebuild:
+  add new download system
+
   04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
   -novell-nldapbase-8.7.3_p34.ebuild, -novell-nldapbase-8.7.3_p37.ebuild,
   -novell-nldapbase-8.7.3.8_p41.ebuild,
diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest b/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
index 6d025d4..6196942 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/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-nldapbase-8.7.3.9_p54-r1.ebuild 1034 RMD160 8448fc72c80a9eaa709a3b2cf55b9bcc4e75dfe8 SHA1 9584bfb93570f42b854e3d4dc992b56face7c228 SHA256 cc1df51e75d6941bb05bc13dc96977b77a6631bd0da667c8be1de1b9afb5b7bc
-MD5 d0418ffdcb2ec64f45812b44ae7fa728 novell-nldapbase-8.7.3.9_p54-r1.ebuild 1034
-RMD160 8448fc72c80a9eaa709a3b2cf55b9bcc4e75dfe8 novell-nldapbase-8.7.3.9_p54-r1.ebuild 1034
-SHA256 cc1df51e75d6941bb05bc13dc96977b77a6631bd0da667c8be1de1b9afb5b7bc novell-nldapbase-8.7.3.9_p54-r1.ebuild 1034
-MISC ChangeLog 931 RMD160 717b17a9e36bd7ad812feab7072281ae88b21976 SHA1 ba5df025e4a7ff628467b7f97d999c0e3c879e72 SHA256 51da9b211caa79d2f55ffad0d19b5aadc52d098fb037ef42e68bfced43d5f7d7
-MD5 fe5c007ac92a442daab023ce2d4473a5 ChangeLog 931
-RMD160 717b17a9e36bd7ad812feab7072281ae88b21976 ChangeLog 931
-SHA256 51da9b211caa79d2f55ffad0d19b5aadc52d098fb037ef42e68bfced43d5f7d7 ChangeLog 931
+EBUILD novell-nldapbase-8.7.3.9_p54-r1.ebuild 1753 RMD160 31b6cc90e6977bd2d8070ceed5eec7390d2e2428 SHA1 94b81426e0d125ce2b7aff23e875ac43303b5631 SHA256 0be8d6ad25df19c6df9a7d0ef1379850f835c4814b2856f77243fc4994460135
+MD5 c82d15c9f2037dbc477dadb4353ba49e novell-nldapbase-8.7.3.9_p54-r1.ebuild 1753
+RMD160 31b6cc90e6977bd2d8070ceed5eec7390d2e2428 novell-nldapbase-8.7.3.9_p54-r1.ebuild 1753
+SHA256 0be8d6ad25df19c6df9a7d0ef1379850f835c4814b2856f77243fc4994460135 novell-nldapbase-8.7.3.9_p54-r1.ebuild 1753
+MISC ChangeLog 1048 RMD160 7a71ef6db565fb9da30c863893b1c49db85e24d7 SHA1 998c187f8388bd4c0cdf4fa58b8c4a66547c6592 SHA256 50c28a4229f21882115c58537feb13253a757194f183c38ec28afdd4db771c9f
+MD5 e51c76430d0d95df35a79930fac84f63 ChangeLog 1048
+RMD160 7a71ef6db565fb9da30c863893b1c49db85e24d7 ChangeLog 1048
+SHA256 50c28a4229f21882115c58537feb13253a757194f183c38ec28afdd4db771c9f ChangeLog 1048
 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-nldapbase/novell-nldapbase-8.7.3.9_p54-r1.ebuild b/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.9_p54-r1.ebuild
index 28b9c77..540b633 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.9_p54-r1.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.9_p54-r1.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 LDAP Tools and Libraries"
 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"
@@ -18,10 +22,7 @@ IUSE="linguas_fr"
 DEPEND=""
 
 RDEPEND="virtual/libc
-	>=net-nds/novell-nldapsdk-8.7.3.9_p51
-	!net-misc/novell-nldapbase"
-
-RESTRICT="nomirror nostrip"
+	>=net-nds/novell-nldapsdk-8.7.3.9_p51"
 
 src_unpack() {
 	unpack ${A}
@@ -40,4 +41,18 @@ src_install() {
 	doman ${WORKDIR}/${PN}-${MY_PV}/usr/ldaptools/man/*/*
         use linguas_fr && doman -i18n=fr ${WORKDIR}/${PN}-${MY_PV}/usr/ldaptools/man/fr/*/*
 
-}
\ 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"
+}