diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index e13c78b..056fee9 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -137,15 +137,6 @@ MODE1 is enabled and vice-versa."
 
 ;;;; Functions
 
-(defun oni:augment-sql-prompt ()
-  "Add the MariaDB prompt to the `sql-prompt-regexp'."
-  (if (eq sql-product 'mysql)
-      (setq sql-prompt-regexp
-            (rx (and line-start
-                     (or "mysql"
-                         (and "MariaDB [" (1+ nonl) "]"))
-                     "> ")))))
-
 (defun awesome-send (command)
   "Send COMMAND through awesome-client to awesome."
   (shell-command (format "echo '%s' | awesome-client" command)))
@@ -1105,7 +1096,10 @@ If no direction is given, don't split."
 (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline)
 (add-hook 'scheme-mode-hook (lambda () (setq ac-sources '(ac-source-geiser))))
 (add-hook 'slime-mode-hook #'set-up-slime-ac)
-(add-hook 'sql-interactive-mode-hook #'oni:augment-sql-prompt)
+
+;; Support the prompt from MariaDB
+(add-hook 'sql-interactive-mode-hook 'oni:augment-sql-prompt)
+
 (add-hook 'term-mode-hook 'oni:term-mode-func)
 (add-hook 'vala-mode-hook #'oni:vala-mode-func)
 (add-hook 'write-file-hooks 'oni:write-file-func)
diff --git a/emacs/.emacs.d/site-lisp/oni-sql.el b/emacs/.emacs.d/site-lisp/oni-sql.el
new file mode 100644
index 0000000..c4a43ee
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-sql.el
@@ -0,0 +1,40 @@
+;;; oni-sql.el --- SQL commands and functions        -*- 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 SQL commands and functions.
+
+;;; Code:
+
+(require 'sql)
+
+;;;###autoload
+(defun oni:augment-sql-prompt ()
+  "Add the MariaDB prompt to the `sql-prompt-regexp'."
+  (if (eq sql-product 'mysql)
+      (setq sql-prompt-regexp
+            (rx (and line-start
+                     (or "mysql"
+                         (and "MariaDB [" (1+ nonl) "]"))
+                     "> ")))))
+
+(provide 'oni-sql)
+;;; oni-sql.el ends here