diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 5cc1e1e3..e602ecaa 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Dunixfs=false -Xmx256m -Dapplication.deployment=deb -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/.temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
+java -Dunixfs=false -Xmx256m -Dapplication.deployment=deb -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/ipkg/filebot.sh b/installer/ipkg/filebot.sh
index dd2113c2..2b08b588 100644
--- a/installer/ipkg/filebot.sh
+++ b/installer/ipkg/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Dunixfs=false -Dapplication.deployment=ipkg -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/.temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
+java -Dunixfs=false -Dapplication.deployment=ipkg -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index 9123d1de..eb1ffed6 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -21,7 +21,7 @@
 -Dsun.net.client.defaultReadTimeout=25000
 
 # put all temporary files here
--Djava.io.tmpdir="%EXEDIR%/.temp"
+-Djava.io.tmpdir="%EXEDIR%/temp"
 
 # look for native libs here
 -Djna.library.path="%EXEDIR%"
diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh
index c1449182..51fe0a92 100644
--- a/installer/portable/filebot.sh
+++ b/installer/portable/filebot.sh
@@ -3,4 +3,4 @@ SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-java -Dunixfs=false -Xmx256m -Dapplication.deployment=portable "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/.temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory -Dnet.sourceforge.tuned.prefs.file=prefs.properties -jar "$dir_bin/FileBot.jar" "$@"
\ No newline at end of file
+java -Dunixfs=false -Xmx256m -Dapplication.deployment=portable "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory -Dnet.sourceforge.tuned.prefs.file=prefs.properties -jar "$dir_bin/FileBot.jar" "$@"
\ No newline at end of file
diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java
index 8b6dd154..5b7c27dc 100644
--- a/source/net/sourceforge/filebot/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -3,6 +3,7 @@ package net.sourceforge.filebot;
 
 
 import static java.awt.GraphicsEnvironment.*;
+import static java.util.regex.Pattern.*;
 import static javax.swing.JFrame.*;
 import static net.sourceforge.filebot.Settings.*;
 import static net.sourceforge.tuned.FileUtilities.*;
@@ -90,7 +91,7 @@ public class Main {
 				// clear preferences and cache
 				System.out.println("Reset preferences and clear cache");
 				for (File cache : getApplicationFolder().listFiles(FOLDERS)) {
-					if (cache.getName().startsWith(".")) {
+					if (matches("cache|temp|grape", cache.getName())) {
 						delete(cache);
 					}
 				}
@@ -324,7 +325,7 @@ public class Main {
 	 */
 	private static void initializeCache() {
 		// prepare cache folder for this application instance
-		File cacheRoot = new File(getApplicationFolder(), ".cache");
+		File cacheRoot = new File(getApplicationFolder(), "cache");
 		
 		try {
 			for (int i = 0; true; i++) {