diff --git a/source/ehcache.xml b/source/ehcache.xml
index aa340d72..6c38d9c0 100644
--- a/source/ehcache.xml
+++ b/source/ehcache.xml
@@ -39,7 +39,7 @@
 
     Subdirectories can be specified below the property e.g. java.io.tmpdir/one
     -->
-    <diskStore path="java.io.tmpdir/filebot-cache" />
+    <diskStore path="user.home/.filebot/cache" />
     
     <!--
     Cache configuration
diff --git a/source/net/sourceforge/filebot/Settings.java b/source/net/sourceforge/filebot/Settings.java
index cfc99530..58a7a38b 100644
--- a/source/net/sourceforge/filebot/Settings.java
+++ b/source/net/sourceforge/filebot/Settings.java
@@ -36,7 +36,7 @@ public final class Settings {
 		// special handling for web start
 		if (System.getProperty("application.deployment") != null || System.getProperty("javawebstart.version") != null) {
 			// can't use working directory for web start applications
-			File folder = new File(System.getProperty("user.home"), "." + getApplicationName().toLowerCase());
+			File folder = new File(System.getProperty("user.home"), ".filebot");
 			
 			// create folder if necessary 
 			if (!folder.exists()) {