diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog b/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog
index 2f549e9b..3283b6e5 100644
--- a/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog
+++ b/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  novell-novlc1-1.3.6_p2-r2.ebuild, files/ConsoleOne-136-pre:
+  add hack for x86_64 systems
+
   17 Dec 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
   groupwise plugin is only 32bit
 
diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest
index 91cb2a11..61c8cdef 100644
--- a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest
@@ -1,8 +1,8 @@
-AUX ConsoleOne-136-pre 568 RMD160 d1fe940d9acd0cb2ce74cf56c1c34495eeb8c60b SHA1 284f91f6a08975f81fdb85ae0259beb4765adc14 SHA256 ca8e298c4cd637218930eb5c49aec1119ab2d51c20a2d7b8118bafe90e20bc9b
+AUX ConsoleOne-136-pre 657 RMD160 21ed44e115e0f7dd421e6915afb7eef83c6f84a2 SHA1 de8b0661942bb33be4ca476db2a1cf707ae3000b SHA256 a81b88410b59307d2d9c6f5aaf4fc22a9116bed5db0adf71e58cc06619de2d40
 DIST c1_1.3.6h_patch2.zip 797242 RMD160 796a2fcee8a3e0581b2876720110e0e8642e10fa SHA1 836b03278eac210445bbffe4ec55ea6234be8d80 SHA256 163bac905856402cb7ae3dfea73374fc9d0a4f501ba5f4e99e972f7285ba007b
 DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b
 EBUILD novell-novlc1-1.3.6_p2-r1.ebuild 5357 RMD160 48b7c407b35f2ad62d0c8b668c5bfded2d95dd04 SHA1 012e97f5d633eab5c2e9deeb41a01d2042d882e1 SHA256 128e7a449098a6c89bbd1a19a7e0f9a13771a5c281ff8ecd66797c8a0a70197f
-EBUILD novell-novlc1-1.3.6_p2-r2.ebuild 5456 RMD160 256c9a1919dc750feb478b3ed4f049bc9f003a9a SHA1 c18e0b81f5d322a18d6a692d1064a584bf557934 SHA256 6d1853565abdc060422e65a152acbf9dca3bbe403db31982302124788e518775
+EBUILD novell-novlc1-1.3.6_p2-r2.ebuild 5490 RMD160 8454c81c3ec246c74a1915d0296c4265931deed7 SHA1 95aea027af872ae74885164f30be1312c79443ad SHA256 872cc3b9c291ea275e186b44f2e366fdd4cd81d5398b8c95135a001a23d78f70
 EBUILD novell-novlc1-1.3.6_p2.ebuild 5443 RMD160 2bfea03b9092590e028f4888841b3a96e72222c2 SHA1 d277cf86470f62446e826136148ca4e1efd277fe SHA256 0793f18cab69be1e8426c4f91cccc10e1cd63b8f7cdd45dc460d7f14b099f424
-MISC ChangeLog 2527 RMD160 bd170187b488891835a89881fa4880f7173633d7 SHA1 699fc69d8686a68aec6ee6ae4a591514781c1bc9 SHA256 5705073094c32bf04757ffb8b0a3c1a0edf48ec3c1cc6e58ab5123467228f4a5
+MISC ChangeLog 2671 RMD160 f6a06ba5025b12e0c137d63663366c3180c7361b SHA1 b37c5a6a62fc8667383f0a8f1cd3d3c6cc75cb8c SHA256 83f2366bc9ad8166be26d2c6d8f36651db05d53d73e692e687d2dbcd64c6462e
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/files/ConsoleOne-136-pre b/trunk/novell4gentoo/app-admin/novell-novlc1/files/ConsoleOne-136-pre
index ba7f3b2e..4ad9f4e5 100644
--- a/trunk/novell4gentoo/app-admin/novell-novlc1/files/ConsoleOne-136-pre
+++ b/trunk/novell4gentoo/app-admin/novell-novlc1/files/ConsoleOne-136-pre
@@ -7,6 +7,10 @@ if [ ! -d "/var/novell/nici/`id -u`" ] ; then
     /var/novell/nici/primenici
 fi
 
+if [ "`uname -m`" = "x86_64" ] ; then
+    export GENTOO_VM="emul-linux-x86-java-1.6"
+fi
+
 LD_LIBRARY_PATH="/usr/ConsoleOne/bin:/usr/ConsoleOne/lib:/usr/ConsoleOne/lib32:/usr/lib:/usr/lib32:/opt/novell/lib:/opt/novell/lib32:/opt/novell/eDirectory/lib:/opt/novell/eDirectory/lib32:$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p2-r2.ebuild b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p2-r2.ebuild
index cbaed0a6..58293227 100644
--- a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p2-r2.ebuild
+++ b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p2-r2.ebuild
@@ -31,7 +31,8 @@ DEPEND="net-nds/novell-ndsbase:8.7
 
 RDEPEND="virtual/libc
 	x86? ( >=virtual/jdk-1.4 )
-	amd64? ( >=java-virtuals/jre32-1.4 )
+	amd64? ( >=virtual/jdk-1.4
+		=app-emulation/emul-linux-x86-java-1.6* )
 	>=dev-java/java-config-2
 	net-nds/novell-ndsbase:8.7
 	net-nds/novell-ndscommon:8.7