diff --git a/config.org b/config.org
index 9161825..f34dfe9 100644
--- a/config.org
+++ b/config.org
@@ -18,7 +18,8 @@ This configuration requires the installation of :
     - =clang= (for ivory)
     - =cmake= (for ivory)
     - =llvm-libs= (for cmake, somehow not a dependency on Manjaro when installing cmake)
-    - Use python-pip to install =jedi=, =flake8=, =importmagic= and =autopep8= (for elpy)
+    - Use python-pip to install requirements for elpy:
+      =pip install jedi flake8 importmagic autopep8 yapf=
     - =ditaa= (for ascii to image generation in org-mode)
 
 When first checking out this config, run =irony-install-server= to make and install the irony-server.
@@ -736,6 +737,21 @@ https://github.com/ikirill/irony-eldoc
 )
 #+END_SRC
 
+** Python mode
+
+Use =elpy=:
+https://github.com/jorgenschaefer/elpy
+
+It is a full dev env and sometimes feels like a bit too much but overal good experience.
+
+#+BEGIN_SRC emacs-lisp
+(use-package elpy
+  :ensure t
+  :config
+    (elpy-enable)
+)
+#+END_SRC
+
 * Windows
 
 ** Splitting
diff --git a/init.el b/init.el
index 16b4ed1..dbbf211 100644
--- a/init.el
+++ b/init.el
@@ -30,7 +30,7 @@
  '(helm-gtags-auto-update t)
  '(package-selected-packages
    (quote
-    (linum-relative avy flycheck-irony irony-eldoc company-irony company-c-headers flycheck magit py-autopep8 multiple-cursors helm-gtags helm-swoop zygospore yasnippet volatile-highlights use-package undo-tree smartparens smart-mode-line monokai-theme iedit helm expand-region dashboard comment-dwim-2))))
+    (elpy linum-relative avy flycheck-irony irony-eldoc company-irony company-c-headers flycheck magit py-autopep8 multiple-cursors helm-gtags helm-swoop zygospore yasnippet volatile-highlights use-package undo-tree smartparens smart-mode-line monokai-theme iedit helm expand-region dashboard comment-dwim-2))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.