diff --git a/UPGRADING b/UPGRADING
index 2088a286b3c..00acc27423a 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -75,6 +75,10 @@ UPGRADE NOTES - PHP 5.4
   - safe_mode_protected_env_vars
   - zend.ze1_compatibility_mode
 
+- the following new directives were added
+
+  - max_input_vars - specifies how many GET/POST/COOKIE input variables may be
+    accepted. default value 1000. 
 
 =============================
 2. Reserved words and classes
diff --git a/php.ini-development b/php.ini-development
index e9705704606..e6a0f6dcc11 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -397,6 +397,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M
diff --git a/php.ini-production b/php.ini-production
index 11cb31c437b..5a1052fcfea 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -397,6 +397,9 @@ max_input_time = 60
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
 memory_limit = 128M