diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
new file mode 100644
index 0000000..700c37c
--- /dev/null
+++ b/conf/extra_php-fpm.conf
@@ -0,0 +1,4 @@
+; Additional php.ini defines, specific to this pool of workers.
+
+php_admin_value[upload_max_filesize] = 50M
+php_admin_value[post_max_size] = 50M
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 4bd58b3..e71b042 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -9,6 +9,10 @@ location __PATH__/ {
   rewrite ^__PATH__/play/ssid/(.*)/type/(.*)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/transcode_to/(w+)/bitrate/([0-9]+)/player/(.*)/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&transcode_to=$7&bitrate=$8&player=$9&name=$10 last;
 
   index index.php;
+
+  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
+  client_max_body_size 50M;
+
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;