diff --git a/.gitignore b/.gitignore
index 4f4773fb3..f40b2b66f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 config.php
+cache/*/*
+lock/*
diff --git a/cache/.htaccess b/cache/.htaccess
new file mode 100644
index 000000000..93169e4eb
--- /dev/null
+++ b/cache/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all
diff --git a/cache/magpie/.empty b/cache/magpie/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/cache/simplepie/.empty b/cache/simplepie/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/config.php-dist b/config.php-dist
index 08401133f..b52414d9f 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -15,7 +15,7 @@
 	// longer than 5 seconds to generate.  To prevent failed
 	// updates, increase this.
 
-	define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache');
+	define('MAGPIE_CACHE_DIR', 'cache/magpie');
 	// Local cache directory for RSS feeds
 
 	define('MAGPIE_CACHE_AGE', 60*30); 
@@ -95,7 +95,7 @@
 	// 0 - Magpie
 	// 1 - SimplePie
 
-	define('SIMPLEPIE_CACHE_DIR',	'/var/tmp/simplepie-ttrss-cache');
+	define('SIMPLEPIE_CACHE_DIR',	'cache/simplepie');
 	// Cache directory for RSS feeds when using SimplePie
 
 	define('SIMPLEPIE_CACHE_IMAGES', false);
@@ -134,7 +134,7 @@
 	// option can be used to integrate tt-rss with Apache's external
 	// authentication modules.
 
-	define('LOCK_DIRECTORY', '.');
+	define('LOCK_DIRECTORY', 'lock');
 	// Directory for lockfiles, must be writable to the user you run
 	// daemon process or cronjobs under.
 
diff --git a/lock/.empty b/lock/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/lock/.htaccess b/lock/.htaccess
new file mode 100644
index 000000000..93169e4eb
--- /dev/null
+++ b/lock/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all