diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest
index 1bb55415..a6791824 100644
--- a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest
@@ -1,7 +1,7 @@
-AUX novell-novlc1-1.3.6 136 RMD160 95d10220c79733c18a26e3f9d9ac10ec210c3c7f SHA1 a06edc9a8c5a762d90b0515be3f502fe7166e412 SHA256 c7167438951559c40c7ded0199c7621518b7a4d0e93fedadaafa2f50042aec98
-MD5 a016ed9155148e12f1bf3e53ac440911 files/novell-novlc1-1.3.6 136
-RMD160 95d10220c79733c18a26e3f9d9ac10ec210c3c7f files/novell-novlc1-1.3.6 136
-SHA256 c7167438951559c40c7ded0199c7621518b7a4d0e93fedadaafa2f50042aec98 files/novell-novlc1-1.3.6 136
+AUX novell-novlc1 136 RMD160 95d10220c79733c18a26e3f9d9ac10ec210c3c7f SHA1 a06edc9a8c5a762d90b0515be3f502fe7166e412 SHA256 c7167438951559c40c7ded0199c7621518b7a4d0e93fedadaafa2f50042aec98
+MD5 a016ed9155148e12f1bf3e53ac440911 files/novell-novlc1 136
+RMD160 95d10220c79733c18a26e3f9d9ac10ec210c3c7f files/novell-novlc1 136
+SHA256 c7167438951559c40c7ded0199c7621518b7a4d0e93fedadaafa2f50042aec98 files/novell-novlc1 136
 DIST c1_136f-linux.tar.gz 39985363 RMD160 f6a18cd0c9802c41ae35fb587e08f807776de92f SHA1 f592a1022fc6d64391b0c7dd7d6b2adb6ad5ad16 SHA256 1263d8e3610719d9f353ac43501b596bfcef126c24f749af8cee1247148927a9
 EBUILD novell-novlc1-1.3.6_p1-r3.ebuild 3467 RMD160 36af3ec3cb9c3c780f017de99ed11d165b673b88 SHA1 0d6491b090ee6c3e8d430f011251fa0919daea93 SHA256 85710a6ba33afb19a4e4f3e5542e206f98db4487f2dd8f1f2766f5f565a4c452
 MD5 5d0dc652ec7578a70ce7da74e535e0b8 novell-novlc1-1.3.6_p1-r3.ebuild 3467
@@ -11,10 +11,10 @@ EBUILD novell-novlc1-1.3.6_p1-r4.ebuild 4093 RMD160 7feead13593e7ce54408b1bbdc80
 MD5 ffd2b32deae1bf83bb0d5b3f4cab44d7 novell-novlc1-1.3.6_p1-r4.ebuild 4093
 RMD160 7feead13593e7ce54408b1bbdc804fa8a5364846 novell-novlc1-1.3.6_p1-r4.ebuild 4093
 SHA256 e3554233c2987539e24c052a31a49889c75a1144042f5921e048726f7630df60 novell-novlc1-1.3.6_p1-r4.ebuild 4093
-EBUILD novell-novlc1-1.3.6_p1-r5.ebuild 4190 RMD160 f4facd96b3e598d97dd194f47fa8353c17ffea71 SHA1 3ec06fb2c74061b9e1fd757e81816cdb973e343a SHA256 74de8453720a155f83d03113942ef31d6fb6ae674101011d0360a4f241175e88
-MD5 f48dd3ea771cdfef919cc3b5b32f0268 novell-novlc1-1.3.6_p1-r5.ebuild 4190
-RMD160 f4facd96b3e598d97dd194f47fa8353c17ffea71 novell-novlc1-1.3.6_p1-r5.ebuild 4190
-SHA256 74de8453720a155f83d03113942ef31d6fb6ae674101011d0360a4f241175e88 novell-novlc1-1.3.6_p1-r5.ebuild 4190
+EBUILD novell-novlc1-1.3.6_p1-r5.ebuild 4240 RMD160 b1b3ad7c4da714f7675ad52b6dbf5390b5a203f6 SHA1 8767bbdf740b94d0787025525ccda0b414e4dce4 SHA256 69209a9e96651d4a06d4de740bb714b95a46e82d633b58496996849ca5e2af3b
+MD5 e973c18be3d77a90f9270415eb37ce49 novell-novlc1-1.3.6_p1-r5.ebuild 4240
+RMD160 b1b3ad7c4da714f7675ad52b6dbf5390b5a203f6 novell-novlc1-1.3.6_p1-r5.ebuild 4240
+SHA256 69209a9e96651d4a06d4de740bb714b95a46e82d633b58496996849ca5e2af3b novell-novlc1-1.3.6_p1-r5.ebuild 4240
 MISC ChangeLog 1064 RMD160 a375ee6b3ea90b98acb86eda18b45d1e75f1d86e SHA1 ac138860564325df57995c03673d8319d40ad2bc SHA256 b8700088139978a2b58cda6c6288e0f80629e5c86c463b93791725c9d009af19
 MD5 3f0d3ebee33a314c18400859acf4f776 ChangeLog 1064
 RMD160 a375ee6b3ea90b98acb86eda18b45d1e75f1d86e ChangeLog 1064
diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1-1.3.6 b/trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1-1.3.6
rename to trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1
diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild
index 4d9f4355..28d40194 100644
--- a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild
+++ b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild
@@ -55,9 +55,11 @@ src_unpack() {
 	java-pkg_jar-from novell-npkiapi npki.jar
 	java-pkg_jar-from novell-novlsas nssl.jar
 	java-pkg_jar-from novell-novlsas jssl.jar
+	java-pkg_addcp /usr/ConsoleOne/ConsoleOneExt
 	java-pkg_addcp /usr/ConsoleOne/help
-	java-pkg_addcp /usr/lib
 	java-pkg_addcp /usr/ConsoleOne/lib
+	java-pkg_addcp /usr/lib
+	java-pkg_addcp /opt/novell/eDirectory/lib
 }
 
 src_compile() { :; }
@@ -86,10 +88,10 @@ src_install() {
 	#dosed 's%$APPHOME/jre%`java-config --jre-home`%' /usr/ConsoleOne/bin/ConsoleOne
 	insinto /usr/ConsoleOne/help
 	doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/*
-	java-pkg_dolauncher ConsoleOne --pkg_args "-libpath=/usr/ConsoleOne/ConsoleOneExt -prefdir=user.home" \
+	java-pkg_dolauncher ConsoleOne --pkg_args "-prefdir=user.home" \
 				       --java_args "-Dapplication.home=/usr/ConsoleOne -noverify" \
 				       --main com.novell.application.console.shell.Console \
-				       --pre ${FILESDIR}/${P}
+				       -pre ${FILESDIR}/${PN}
 
 #	insinto /usr/ConsoleOne/bin
 	doicon ${WORKDIR}/Linux/ConsoleOneIcon.png