diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index aa507cf..5f2f4f2 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -133,6 +133,26 @@
   (add-hook 'gud-mode-hook
             '(lambda () (setq-local comint-prompt-read-only t))))
 
+
+(use-package org
+  :defer
+  :config
+  ;; Make windmove work in org-mode:
+  (add-hook 'org-shiftup-final-hook 'windmove-up)
+  (add-hook 'org-shiftleft-final-hook 'windmove-left)
+  (add-hook 'org-shiftdown-final-hook 'windmove-down)
+  (add-hook 'org-shiftright-final-hook 'windmove-right)
+
+  ;; enable line wraping
+  (add-hook 'org-mode-hook '(lambda ()
+                              (visual-line-mode)
+                              (setq word-wrap t)))
+
+  (setq org-confirm-babel-evaluate nil)
+  (define-key org-mode-map (kbd "C-z") 'org-latex-export-to-pdf)
+  (add-to-list 'org-babel-load-languages '(dot . t))
+  (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot)))
+
 ;;;; external packages (required)
 (use-package company :quelpa
   :config