diff --git a/oni-core.el b/oni-core.el
index 16af1eb..9def407 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2022.0526.223326
+;; Version: 2022.0817.144942
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview dashboard mixed-pitch ace-window vertico marginalia orderless consult embark docstr)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -284,6 +284,7 @@ _s_: String list"
 (with-eval-after-load 'elisp-mode (require 'oni-elisp))
 (with-eval-after-load 'elm-mode (require 'oni-elm))
 (with-eval-after-load 'embrace (require 'oni-embrace))
+(with-eval-after-load 'emms (require 'oni-emms))
 (with-eval-after-load 'eshell (require 'oni-eshell))
 (with-eval-after-load 'fish-mode (require 'oni-fish))
 (with-eval-after-load 'flycheck (require 'oni-flycheck))
diff --git a/oni-emms.el b/oni-emms.el
new file mode 100644
index 0000000..59e9a3c
--- /dev/null
+++ b/oni-emms.el
@@ -0,0 +1,35 @@
+;;; oni-emms.el --- Configuration for EMMS           -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 2022.0817.142820
+;; Package-Requires: (emms)
+
+;; 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 <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Configuration for EMMS. Loads and sets up EMMS to play CDs with MPV.
+
+;;; Code:
+
+(require 'emms)
+(require 'emms-player-mpv)
+
+(add-to-list 'emms-player-list 'emms-player-mpv)
+
+(provide 'oni-emms)
+;;; oni-emms.el ends here