diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 1ce3f7d..d519b91 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,10 +141,6 @@ MODE1 is enabled and vice-versa."
   "Set the `disabled' property for each item in FUNCTIONS to nil."
   (mapc #'(lambda (f) (put f 'disabled nil)) functions))
 
-(defun oni:prog-mode-func ()
-  "Function for `prog-mode-hook'."
-  (setq-local comment-auto-fill-only-comments t))
-
 (defun oni:python-mode-func ()
   "Function for `python-mode-hook'."
   (local-set-key (kbd "C->") 'python-indent-shift-right)
@@ -874,6 +870,9 @@ If no direction is given, don't split."
 ;; Notify me of the finished status of compilation.
 (add-hook 'compilation-finish-functions 'oni:alert-compilation-finish)
 
+;; Only autofill comments in programming buffers.
+(add-hook 'prog-mode-hook 'oni:auto-fill-only-comments)
+
 (oni:add-function-to-hooks 'oni:make-readable
   'Info-mode-hook 'gnus-article-mode-hook 'gnus-group-mode-hook
   'org-agenda-mode-hook)
@@ -929,7 +928,7 @@ If no direction is given, don't split."
   #'whitespace-mode 'oni:show-trailing-whitespace)
 
 (oni:add-hooks 'prog-mode-hook
-  #'oni:prog-mode-func 'oni:maybe-fci-mode #'rainbow-delimiters-mode
+  'oni:maybe-fci-mode #'rainbow-delimiters-mode
   'oni:maybe-prettify-symbols-mode)
 
 (oni:add-hooks 'python-mode-hook
diff --git a/emacs/.emacs.d/site-lisp/oni-prog.el b/emacs/.emacs.d/site-lisp/oni-prog.el
new file mode 100644
index 0000000..efc9a71
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-prog.el
@@ -0,0 +1,34 @@
+;;; oni-prog.el --- Extra programming functions and commands  -*- 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:
+
+;; Here are some commands and functions that are generally useful for
+;; programming.
+
+;;; Code:
+
+;;;###autoload
+(defun oni:auto-fill-only-comments ()
+  "Make auto-fill fill only comments."
+  (setq-local comment-auto-fill-only-comments t))
+
+(provide 'oni-prog)
+;;; oni-prog.el ends here