diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 45eb8a8..0a1b43a 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -940,6 +940,13 @@ To start off, first I need to enable lexical binding.
          (with-eval-after-load 'gnus (load "oni-gnus-init"))
        #+END_SRC
 
+  - [[file:init/oni-org-init.org][Org]] :: Org is the craziest and most flexible organizational
+       application anyone's ever seen.
+
+       #+BEGIN_SRC emacs-lisp
+         (with-eval-after-load 'org (load "oni-org-init"))
+       #+END_SRC
+
 ** Linewise user-interface
 
    This is the library used by Circe and Slack to display messages.
@@ -1055,23 +1062,6 @@ To start off, first I need to enable lexical binding.
        (enable-sermon))
    #+END_SRC
 
-** Org
-
-   Tell org-mode to fontify code blocks in their specified languages.
-
-   #+BEGIN_SRC emacs-lisp
-     (eval-when-compile (require 'org))
-
-     (with-eval-after-load 'org
-       (setq org-src-fontify-natively t))
-   #+END_SRC
-
-   Enable automatic text filling for org-mode.
-
-   #+BEGIN_SRC emacs-lisp
-     (add-hook 'org-mode-hook 'auto-fill-mode)
-   #+END_SRC
-
 ** Jabber
 
    I like using XMPP to talk to people, jabber.el is very good at
diff --git a/emacs/.emacs.d/init/oni-org-init.org b/emacs/.emacs.d/init/oni-org-init.org
new file mode 100644
index 0000000..627f7ca
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-org-init.org
@@ -0,0 +1,19 @@
+#+TITLE: Org mode configuration
+
+Tell org-mode to fontify code blocks in their specified languages.
+
+#+BEGIN_SRC emacs-lisp
+  (setq org-src-fontify-natively t)
+#+END_SRC
+
+Pressing RET on a link should really follow that link.
+
+#+BEGIN_SRC emacs-lisp
+  (setq org-return-follows-link t)
+#+END_SRC
+
+Enable automatic text filling for org-mode.
+
+#+BEGIN_SRC emacs-lisp
+  (add-hook 'org-mode-hook 'auto-fill-mode)
+#+END_SRC