diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index bce88dd..93286f3 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -137,10 +137,6 @@ MODE1 is enabled and vice-versa."
 
 ;;;; Functions
 
-(defun update-mailcount ()
-  "Update the mailcount in the wm."
-  (shell-command-to-string "new-mail-mowedline"))
-
 (defun oni:before-save-func ()
   "Function for `before-save-hook'."
   (if (eq major-mode 'html-mode)
@@ -1075,8 +1071,8 @@ If no direction is given, don't split."
 (add-hook 'css-mode-hook #'rainbow-mode)
 (add-hook 'diary-display-hook 'oni:diary-display-func)
 (add-hook 'git-commit-mode-hook #'oni:set-ispell-local-en-dict)
-(add-hook 'gnus-exit-group-hook 'update-mailcount)
-(add-hook 'gnus-exit-gnus-hook 'update-mailcount)
+(add-hook 'gnus-exit-group-hook 'oni:update-mailcount)
+(add-hook 'gnus-exit-gnus-hook 'oni:update-mailcount)
 (add-hook 'haskell-mode-hook 'oni:haskell-mode-func)
 (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline)
 (add-hook 'scheme-mode-hook (lambda () (setq ac-sources '(ac-source-geiser))))
diff --git a/emacs/.emacs.d/site-lisp/oni-mowedline.el b/emacs/.emacs.d/site-lisp/oni-mowedline.el
new file mode 100644
index 0000000..5b2772f
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-mowedline.el
@@ -0,0 +1,47 @@
+;;; oni-mowedline.el --- Functions for mowedline     -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'tracking)
+
+(require 'mowedline "~/projects/ext/mowedline/mowedline.el")
+
+(defvar oni:mowedline--shown-buffers nil)
+
+;;;###autoload
+(defun oni:update-mowedline-irclist ()
+  (let ((irclist
+         (with-temp-buffer
+           (insert (format-mode-line tracking-mode-line-buffers))
+           (buffer-substring-no-properties (point-min) (point-max)))))
+    (mowedline-update 'irclist irclist)))
+
+;;;###autoload
+(defun oni:update-mailcount ()
+  "Update the mailcount in the wm."
+  (shell-command-to-string "new-mail-mowedline"))
+
+(provide 'oni-mowedline)
+;;; oni-mowedline.el ends here