diff --git a/emacs/.emacs.d/GNUmakefile b/emacs/.emacs.d/GNUmakefile
index 7bcee4f..e5171d4 100644
--- a/emacs/.emacs.d/GNUmakefile
+++ b/emacs/.emacs.d/GNUmakefile
@@ -17,6 +17,7 @@ all: $(SITE_LISPS) init.elc $(INIT_LISPS) $(AUTOLOADS_FILE)
         -directory "$(HOME)/.emacs.d/site-lisp" \
         -directory "$(HOME)/.emacs.d/vendor-lisp/emacs-slack" \
         -directory "$(HOME)/.emacs.d/vendor-lisp/circe" \
+        -directory "$(HOME)/.emacs.d/vendor-lisp/circe-serenity" \
         -eval "(package-initialize)" \
         -eval "(byte-compile-file \"$<\")"
 
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index ad56f5e..ba968c2 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -959,6 +959,12 @@ To start off, first I need to enable lexical binding.
          (with-eval-after-load 'slack (load "oni-slack-init"))
        #+END_SRC
 
+  - [[file:init/oni-circe-init.org][Circe]] :: A very nice and clean IRC client for Emacs.
+
+       #+BEGIN_SRC emacs-lisp
+         (with-eval-after-load 'circe (load "oni-circe-init"))
+       #+END_SRC
+
 ** Linewise user-interface
 
    This is the library used by Circe and Slack to display messages.
@@ -1014,66 +1020,6 @@ To start off, first I need to enable lexical binding.
      (setq lui-fill-type nil)
    #+END_SRC
 
-** Circe
-
-   I switched to Circe from ERC because I couldn't make the
-   customizations I wanted to, Circe seems much better at this.
-
-   Make sure that Emacs knows these function exist when the file is
-   being compiled.
-
-   #+BEGIN_SRC emacs-lisp
-     (eval-when-compile (require 'oni-circe))
-   #+END_SRC
-
-   I spend most of my time on IRC on Freenode.
-
-   #+BEGIN_SRC emacs-lisp
-     (eval-when-compile (require 'circe))
-
-     (with-eval-after-load 'circe
-       (add-to-list 'circe-network-options
-                    `("Freenode"
-                      :nick "ryuslash"
-                      :channels ("#emacs"
-                                 "#mowedline"
-                                 "#ninthfloor"
-                                 "#dispass"
-                                 "#linuxvoice"
-                                 "#conkeror")
-                      :nickserv-password
-                      ,(oni-circe-get-password-for "irc.freenode.net"))))
-   #+END_SRC
-
-   Sometimes I watch some Twitch streams as well.
-
-   #+BEGIN_SRC emacs-lisp
-     (with-eval-after-load 'circe
-       (add-to-list 'circe-network-options
-                    `("Twitch"
-                      :use-tls nil
-                      :nick "ryuslash"
-                      :host "irc.twitch.tv"
-                      :pass ,(oni-circe-get-password-for "irc.twitch.tv")
-                      :port 6667)))
-   #+END_SRC
-
-   Enable coloring of nicks.
-
-   #+BEGIN_SRC emacs-lisp
-     (with-eval-after-load 'circe
-       (require 'circe-color-nicks)
-       (enable-circe-color-nicks))
-   #+END_SRC
-
-   Align all nicks.
-
-   #+BEGIN_SRC emacs-lisp
-     (with-eval-after-load 'circe
-       (require 'circe-serenity)
-       (enable-circe-serenity))
-   #+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-circe-init.org b/emacs/.emacs.d/init/oni-circe-init.org
new file mode 100644
index 0000000..7521c04
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-circe-init.org
@@ -0,0 +1,52 @@
+#+TITLE: Circe config
+
+#+BEGIN_SRC emacs-lisp
+  (require 'circe)
+  (require 'circe-color-nicks)
+  (require 'circe-serenity)
+  (require 'oni-circe)
+#+END_SRC
+
+I switched to Circe from ERC because I couldn't make the
+customizations I wanted to, Circe seems much better at this.
+
+I spend most of my time on IRC on Freenode.
+
+#+BEGIN_SRC emacs-lisp
+  (add-to-list 'circe-network-options
+               `("Freenode"
+                 :nick "ryuslash"
+                 :channels ("#emacs"
+                            "#mowedline"
+                            "#ninthfloor"
+                            "#dispass"
+                            "#linuxvoice"
+                            "#conkeror")
+                 :nickserv-password
+                 ,(oni-circe-get-password-for "irc.freenode.net")))
+#+END_SRC
+
+Sometimes I watch some Twitch streams as well.
+
+#+BEGIN_SRC emacs-lisp
+  (add-to-list 'circe-network-options
+               `("Twitch"
+                 :use-tls nil
+                 :nick "ryuslash"
+                 :host "irc.twitch.tv"
+                 :pass ,(oni-circe-get-password-for "irc.twitch.tv")
+                 :port 6667))
+#+END_SRC
+
+Enable coloring of nicks.
+
+#+BEGIN_SRC emacs-lisp
+  (enable-circe-color-nicks)
+#+END_SRC
+
+Align all nicks and generally clean up the buffer. I call it: Circe
+Serenity.
+
+#+BEGIN_SRC emacs-lisp
+  (enable-circe-serenity)
+#+END_SRC