diff --git a/sc2/src/sc2code/libs/file/temp.c b/sc2/src/sc2code/libs/file/temp.c
index c33b1b1b0..6c3fb82e4 100644
--- a/sc2/src/sc2code/libs/file/temp.c
+++ b/sc2/src/sc2code/libs/file/temp.c
@@ -123,7 +123,7 @@ mountTempDir(const char *name) {
 		return -1;
 	}
 
-	tempDir = uio_openDir (repository, "/", 0);
+	tempDir = uio_openDir (repository, "/tmp/", 0);
 	if (tempDir == NULL) {
 		int saveErrno = errno;
 		fprintf (stderr, "Fatal error: Could not open temp dir: %s\n",
diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c
index 0c8aa04b8..cca17c6ae 100644
--- a/sc2/src/starcon2.c
+++ b/sc2/src/starcon2.c
@@ -308,11 +308,11 @@ main (int argc, char *argv[])
 	mem_init ();
 
 	initIO();
-	initTempDir();
 	prepareContentDir (contentdir);
 	prepareConfigDir ();
 	prepareMeleeDir ();
 	prepareSaveDir ();
+	initTempDir();
 	
 	InitTimeSystem ();
 	InitTaskSystem ();