--- a/JavaRelease.st	Sat Dec 15 00:06:40 2012 +0000
+++ b/JavaRelease.st	Sat Dec 15 00:08:52 2012 +0000
@@ -595,8 +595,8 @@
 
     | jreHome jdkHome |
     classPath := OrderedCollection new.
-    jreHome := self jreHome.
-    jdkHome := self javaHome.
+    jreHome := self jreHome asFilename.
+    jdkHome := self javaHome asFilename.
     jreHome isNil ifTrue:[ ^ #() ].
     "Ensure, that rt.jar is first"
     classPath add: (JavaPathElement newFromRelease:(jreHome / 'lib' / 'rt.jar') asString).
@@ -617,7 +617,7 @@
     "
 
     "Created: / 27-10-2010 / 21:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 15-12-2012 / 00:50:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-12-2012 / 01:05:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 searchForClassPathIn: dir 
@@ -661,11 +661,18 @@
 
     ^nil
 
+    "
+    Java release searchForJavaHome
+    Java release javaHome
+
+    "
+
     "Created: / 27-10-2010 / 19:03:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 22-11-2010 / 13:18:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-03-2011 / 13:29:14 / Jan Kurs <kursjan@fit.cvut.cz>"
     "Modified: / 15-03-2011 / 13:47:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 19-07-2012 / 11:08:04 / jv"
+    "Modified (comment): / 15-12-2012 / 01:04:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 searchForSourcePath
@@ -925,9 +932,10 @@
 !
 
 javaHomesOnUNIX
-    ^ #( '/usr/lib/jvm/java-6-openjdk/jre' )
+    ^ #( '/usr/lib/jvm/java-6-openjdk'
+         '/usr/lib/jvm/java-6-openjdk/jre' )
 
-    "Modified: / 07-08-2011 / 20:38:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-12-2012 / 01:02:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 name