diff --git a/contrib/auto-completion/README.md b/contrib/auto-completion/README.md
index 51d28256b..b7398ff03 100644
--- a/contrib/auto-completion/README.md
+++ b/contrib/auto-completion/README.md
@@ -8,7 +8,7 @@
     - [Install](#install)
         - [Company variables](#company-variables)
     - [Configure](#configure)
-        - [Remove global activation of company](#remove-global-activation-of-company)
+        - [Enable company or auto-complete globally](#enable-company-or-auto-complete-globally)
         - [Replacing company by auto-complete](#replacing-company-by-auto-complete)
         - [Add auto-completion in a layer](#add-auto-completion-in-a-layer)
     - [Key Bindings](#key-bindings)
@@ -55,14 +55,25 @@ to `t`
 
 ## Configure
 
-### Remove global activation of company
+### Enable company or auto-complete globally
 
-TODO (when use-package hooks will be used)
+By default Spacemacs enables auto-completion explicitly for each supported
+major-mode, it means that `company` and `auto-complete` are not enabled
+globally, it allows more flexibility to choose an auto-completion engine
+for a given mode.
+
+You may want to enable company globally to get auto-completion
+everywhere even in the modes which are not configured by Spacemacs. To do
+so, you just have to add `(global-company-mode)` in the
+`dotspacemacs/config` function of your dotfile.
+
+Note that if you want to enable `auto-complete` globally you will have to
+disable `company` first, see the next section to do so.
 
 ### Replacing company by auto-complete
 
-You can disable company by adding it to the `dotspacemacs-excluded-packages`
-variable, then you are free to enable auto-complete globally.
+You can disable `company` by adding it to the `dotspacemacs-excluded-packages`
+variable, then you are free to enable `auto-complete` globally.
 
 ### Add auto-completion in a layer