diff --git a/defaults/main.yml b/defaults/main.yml
index 895f917a78190df43d08ca53c4f9b7e67f96411d..0675523aa08cffa206b4875d89a083fd111889c3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -33,6 +33,7 @@ php_html_errors: 'Off'
 php_log_errors: 'On'
 php_magic_quotes_gpc: 'On'
 php_max_execution_time: '30'
+php_max_file_uploads: '20'
 php_max_input_vars: '1000'
 php_memory_limit: '32M'
 php_needs_oci8: false
diff --git a/templates/etc-php5-apache2-php.ini b/templates/etc-php5-apache2-php.ini
index d0bd7879af1c43e30f54d827488dda15ecb3ceca..5f904dda13a8a74a144866935c8c3987cb3f387f 100644
--- a/templates/etc-php5-apache2-php.ini
+++ b/templates/etc-php5-apache2-php.ini
@@ -833,7 +833,7 @@ upload_tmp_dir = {{ jailroot }}/{{ item.jail.name }}/tmp
 upload_max_filesize = {{ php_upload_max_filesize }}
 
 ; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 20
+max_file_uploads = {{ php_max_file_uploads }}
 
 ;;;;;;;;;;;;;;;;;;
 ; Fopen wrappers ;