diff --git a/cache.c b/cache.c
index 39e63a5..91b89a6 100644
--- a/cache.c
+++ b/cache.c
@@ -45,6 +45,10 @@ int cache_create_dirs()
 {
 	char *path;
 
+	path = fmt("%s", cgit_cache_root);
+	if (mkdir(path, S_IRWXU) && errno!=EEXIST)
+		return 0;
+
 	if (!cgit_query_repo)
 		return 0;
 
diff --git a/cgit.c b/cgit.c
index 9dbc608..372b436 100644
--- a/cgit.c
+++ b/cgit.c
@@ -42,12 +42,16 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
 static void cgit_fill_cache(struct cacheitem *item)
 {
+	static char buf[PATH_MAX];
+
+	getcwd(buf, sizeof(buf));
 	htmlfd = item->fd;
 	item->st.st_mtime = time(NULL);
 	if (cgit_query_repo)
 		cgit_print_repo_page(item);
 	else
 		cgit_print_repolist(item);
+	chdir(buf);
 }
 
 static void cgit_check_cache(struct cacheitem *item)