diff --git a/defaults/main.yml b/defaults/main.yml
index 9133e1dce6d58817a6f279570e4325a917532afe..4f3739a47546aaf130dc0f571e8f3864869cea52 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,6 +35,7 @@ php_log_errors: 'On'
 php_magic_quotes_gpc: 'On'
 php_max_execution_time: '30'
 php_max_file_uploads: '20'
+php_max_input_time: '60'
 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 2fff5f522d0957cddae66c4b079b92de0622e886..15583772ea784894450867982a72bf5d5db3bb63 100644
--- a/templates/etc-php5-apache2-php.ini
+++ b/templates/etc-php5-apache2-php.ini
@@ -412,7 +412,7 @@ max_execution_time = {{ php_max_execution_time }}
 ; Development Value: 60 (60 seconds)
 ; Production Value: 60 (60 seconds)
 ; http://php.net/max-input-time
-max_input_time = 60
+max_input_time = {{ php_max_input_time }}
 
 ; Maximum input variable nesting level
 ; http://php.net/max-input-nesting-level