diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 75cda50..2048928 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -458,6 +458,13 @@ To start off, first I need to enable lexical binding.
 
 * Minor modes
 
+  - [[file:init/oni-company-init.org][Company mode]] :: A better auto completion system than auto
+       complete.
+
+       #+BEGIN_SRC emacs-lisp
+         (with-eval-after-load 'company (load "oni-company-init"))
+       #+END_SRC
+
 ** Paredit
 
    Paredit is an awesome minor-mode to have when you write in any
diff --git a/emacs/.emacs.d/init/oni-company-init.org b/emacs/.emacs.d/init/oni-company-init.org
new file mode 100644
index 0000000..d552d57
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-company-init.org
@@ -0,0 +1,7 @@
+#+TITLE: Company mode configuration
+
+Don't show that company mode is enabled in the minibuffer.
+
+#+BEGIN_SRC emacs-lisp
+  (diminish 'company-mode)
+#+END_SRC