diff --git a/bin/cherokee-server b/bin/cherokee-server
index 575bb94..c0b61ac 100755
--- a/bin/cherokee-server
+++ b/bin/cherokee-server
@@ -16,6 +16,7 @@ fi
 [ -d "/config/cherokee" ] && cp -Rf "/config/cherokee/." "/etc/cherokee/" || cp -Rf "/usr/local/share/template-files/config/defaults/" "/etc/cherokee/"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ -d "/data/htdocs" ] || mkdir -p "/data/htdocs"
+[ -d "/data/cherokee" ] || mkdir -p "/data/cherokee"
 [ -d "/config/cherokee/themes" ] && cp -Rf "/config/cherokee/themes/." "/usr/local/share/cherokee/share/cherokee/themes/"
 if [ -z "$(ls -A /data/htdocs/www/* 2>/dev/null||echo '')" ]; then
   mkdir -p "/data/htdocs" "/data/htdocs/cgi-bin"
@@ -29,6 +30,8 @@ fi
 if [ ! -f "/config/ssl//localhost.crt" ] || [ ! -f "/config/ssl//localhost.key" ]; then
   create-ssl-cert
 fi
+# Fix permissions
+chmod -Rfv 664 "/data/cherokee"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Start php-fpm server
 php-fpm-server &