diff --git a/emacs/init.org b/emacs/init.org
index 277cd12..17a7d2d 100755
--- a/emacs/init.org
+++ b/emacs/init.org
@@ -1009,13 +1009,29 @@ Always show inline images:
   (general-def 'normal org-mode-map "J" #'org-move-subtree-down)
   (general-def 'normal org-mode-map "<return>" #'org-return)
   (general-def 'normal org-mode-map "TAB" #'org-cycle)
+  (general-def 'normal org-mode-map "SPC" leader-map)
   (general-def org-mode-map "C-c e" #'org-preview-latex-fragment)
   (general-def "C-c l" #'org-store-link)
 #+END_SRC
 
-Enable using the leader key in the agenda view:
+Set up evil keybindings:
 #+BEGIN_SRC emacs-lisp
-  (general-def org-agenda-mode-map "SPC" leader-map)
+  (use-package evil-org
+    :after (evil org)
+    :config
+    (add-hook 'org-mode-hook #'evil-org-mode)
+    (add-hook 'evil-org-mode-hook
+	      (lambda ()
+		(evil-org-set-key-theme
+		 '(textobjects
+		   insert
+		   navigation
+		   additional
+		   shift
+		   todo
+		   heading))))
+    (require 'evil-org-agenda)
+    (evil-org-agenda-set-keys))
 #+END_SRC
 
 And a global keybinding to open an org file: