diff --git a/README.md b/README.md
index f5e95542..3f0565bf 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,8 @@ The Fuck has a few settings parameters which can be changed in `$XDG_CONFIG_HOME
 * `wait_command` – max amount of time in seconds for getting previous command output;
 * `no_colors` – disable colored output;
 * `priority` – dict with rules priorities, rule with lower `priority` will be matched first;
-* `debug` – enables debug output, by default `False`.
+* `debug` – enables debug output, by default `False`;
+* `history_limit` &ndash numeric value of how many history commands will be scanned, like `2000`; 
 
 Example of `settings.py`:
 
diff --git a/thefuck/conf.py b/thefuck/conf.py
index 64944838..bab990dc 100644
--- a/thefuck/conf.py
+++ b/thefuck/conf.py
@@ -128,6 +128,8 @@ class Settings(dict):
             return int(val)
         elif attr in ('require_confirmation', 'no_colors', 'debug'):
             return val.lower() == 'true'
+        elif attr == 'history_limit':
+            return int(val)
         else:
             return val