diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8ed655..62bf824 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - Tips: [Smarter cursorline](README.md#smarter-cursorline)
 - Tips: [Saner CTRL-L](README.md#saner-ctrl-l)
 - Tips: [Disable audible and visual bells](README.md#disable-audible-and-visual-bells)
+- Tips: [Faster keyword completion](README.md#faster-keyword-completion)
 - Usage: [Editing remote files](README.md#editing-remote-files)
 - Usage: [Restore cursor position when opening file](README.md#restore-cursor-position-when-opening-file)
 - Usage: [MatchIt](README.md#matchit)
diff --git a/README.md b/README.md
index 1cdc4fe..708fb53 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ added every day. Things about to be added can be found here:
 - [Don't lose selection when shifting sidewards](#dont-lose-selection-when-shifting-sidewards)
 - [Reload a file on saving](#reload-a-file-on-saving)
 - [Smarter cursorline](#smarter-cursorline)
+- [Faster keyword completion](#faster-keyword-completion)
 
 #### [Commands](#commands-1)
 
@@ -1241,6 +1242,18 @@ autocmd InsertEnter * set nocursorline
 autocmd InsertLeave * set cursorline
 ```
 
+#### Faster keyword completion
+
+The keyword completion (`<c-n>`/`<c-p>`) tries completing whatever is listed in
+the `'complete'` option. By default this also includes tags (which can be
+annoying) and scanning all included files (which can be very slow). If you can
+live without these things, disable them:
+
+```viml
+set complete-=i   " disable scanning included files
+set complete-=t   " disable searching tags
+```
+
 ## Commands
 
 Useful commands that are good to know.