diff --git a/conf/nginx.conf b/conf/nginx.conf
index ff184ca2..a16e1372 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -31,10 +31,12 @@ server {
 		index index.php;
 		alias /usr/local/lib/roundcubemail/;
 	}
+
 	location ~ /mail/config/.* {
 		# A ~-style location is needed to give this precedence over the next block.
 		return 403;
 	}
+
 	location ~ /mail/.*\.php {
 		# note: ~ has precendence over a regular location block
 		include fastcgi_params;
@@ -55,6 +57,7 @@ server {
 			deny all;
 	 	}
 	}
+
 	location ~ ^(/cloud)(/.+\.php)(/.*)?$ {
 		# note: ~ has precendence over a regular location block
 		include fastcgi_params;
@@ -62,17 +65,27 @@ server {
 		fastcgi_param SCRIPT_NAME $1$2;
 		fastcgi_param PATH_INFO $3;
 		fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
+		fastcgi_read_timeout 630;
 		fastcgi_pass php-fpm;
 		error_page 403 /cloud/core/templates/403.php;
 		error_page 404 /cloud/core/templates/404.php;
 		client_max_body_size 1G;
 		fastcgi_buffers 64 4K;
 	}
+
 	location ~ ^/((caldav|carddav|webdav).*)$ {
 		# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
 		# Properly proxying like this seems to work fine.
 		proxy_pass https://$HOSTNAME/cloud/remote.php/$1;
 	}
+
+#	location ^~ /cloud/data {
+#		internal;
+#		# Set 'alias' if not using the default 'datadirectory'
+#		# TODO: Since this is auto generated, we need a better approach!
+#		alias /home/user-data/owncloud;
+#	}
+
 	rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
 	rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
 	rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;
@@ -94,8 +107,9 @@ server {
 
 	# Z-Push (Microsoft Exchange ActiveSync)
 	location /Microsoft-Server-ActiveSync {
-	        include /etc/nginx/fastcgi_params;
+		include /etc/nginx/fastcgi_params;
 		fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/index.php;
+		fastcgi_read_timeout 630;
 		fastcgi_pass php-fpm;
 	}
 
diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index f3655668..23641ff1 100755
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -79,7 +79,9 @@ tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
 	upload_max_filesize=16G \
 	post_max_size=16G \
 	output_buffering=16384 \
-	memory_limit=512M
+	memory_limit=512M \
+	max_execution_time=600 \
+	short_open_tag=On
 
 # Download and install the mail app
 # TODO: enable mail app in ownCloud config, not exposed afaik?