diff --git a/ChangeLog b/ChangeLog
index 0b007b8728..16a9aeaa81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
 + Change the proxy variable names in the config to remove the VersionCheck prefix from them
 + Added an Error Reporting Component
 + Javascript files are no longer uglified
+- bug #4145 Config screen fails to validate MemoryLimit = -1 (new default)
 
 4.0.9.0 (not yet released)
 - bug #4104 Can't edit updatable view when searching
@@ -79,7 +80,7 @@ phpMyAdmin - ChangeLog
 
 4.0.7.0 (2013-09-23)
 - bug #3993 Sorting in database overview with statistics doesn't work
-- bug Handle the situation where PHP_SELF is not set 
+- bug Handle the situation where PHP_SELF is not set
 - bug #4080 Overwrite existing file not obeyed
 - bug #3929 Database-specific privileges are not copied when cloning user
 - bug #3997 Error handling in case MySQL extension is missing
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 0916e64196..b8767710b4 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -225,7 +225,7 @@ $cfg_db['_validators'] = array(
     'MaxCharactersInDisplayedSQL' => 'validatePositiveNumber',
     'MaxRows' => 'validatePositiveNumber',
     'MaxTableList' => 'validatePositiveNumber',
-    'MemoryLimit' => array(array('validateByRegex', '/^\d+(?:[kmg])?$/i')),
+    'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')),
     'NavigationTreeTableLevel' => 'validatePositiveNumber',
     'QueryHistoryMax' => 'validatePositiveNumber',
     'QueryWindowWidth' => 'validatePositiveNumber',