--- a/JavaRelease.st	Fri Jan 04 15:23:52 2013 +0000
+++ b/JavaRelease.st	Tue Jan 08 13:15:20 2013 +0000
@@ -243,7 +243,7 @@
 
     "Returns a default class path"
 
-    classPath ifNil:[self searchForClassPath].
+    classPath isNil ifTrue:[self searchForClassPath].
     ^classPath
 
     "
@@ -251,7 +251,7 @@
     "
 
     "Created: / 27-10-2010 / 19:20:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 27-10-2010 / 21:48:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-01-2013 / 12:20:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 javaExtDirs
@@ -941,10 +941,19 @@
 !
 
 javaHomesOnUNIX
-    ^ #( '/usr/lib/jvm/java-6-openjdk'
-         '/usr/lib/jvm/java-6-openjdk/jre' )
+    | arch |
+
+    arch := OperatingSystem getSystemInfo at:#machine.
+    arch = 'x86_64' ifTrue:[arch := 'amd64'].
 
-    "Modified: / 15-12-2012 / 01:02:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    ^ { '/usr/lib/jvm/java-6-openjdk/jre'  .
+        '/usr/lib/jvm/java-6-openjdk-',arch,'/jre' }
+
+    "
+    JavaRelease::OpenJDK6 new javaHomesOnUNIX
+    "
+
+    "Modified (comment): / 08-01-2013 / 12:22:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 name