--- a/smalltalk.rc	Tue Sep 22 17:04:21 2015 +0200
+++ b/smalltalk.rc	Tue Sep 22 18:44:17 2015 +0200
@@ -138,10 +138,10 @@
     (Smalltalk systemPath includes:'.') ifTrue:[
 	Smalltalk systemPath remove:'.'.
     ].
-    (Smalltalk systemPath includes:'.' asFilename pathName) ifTrue:[
-	Smalltalk systemPath remove:'.' asFilename pathName.
+    (Smalltalk systemPath includes:Filename currentDirectory pathName) ifTrue:[
+	Smalltalk systemPath remove:Filename currentDirectory pathName.
     ].
-    Smalltalk systemPath addFirst:'.' asFilename pathName.
+    Smalltalk systemPath addFirst:Filename currentDirectory pathName.
 ].
 
 (path := OperatingSystem getEnvironment:'STX_PACKAGEPATH') notNil ifTrue:[
@@ -828,7 +828,7 @@
  or:[(Smalltalk commandLineArguments includes:'--fastStart')
  or:[(Smalltalk isPlugin)
 ]]]) ifFalse:[
-    ('st.img' asFilename exists not and:['.' asFilename isWritable]) ifTrue:[
+    ('st.img' asFilename exists not and:[Filename currentDirectory isWritable]) ifTrue:[
 	|doneWithStartupStuff|
 
 	doneWithStartupStuff := Semaphore new.