diff --git a/init.el b/init.el
index 33605e7..a9a29a4 100644
--- a/init.el
+++ b/init.el
@@ -994,18 +994,19 @@ are assumed to be of the form *.crt."
 
 ;; * Media
 
-(use-package db-emms
-  :commands (db/play-playlist
-             emms-streams
+(use-package emms-setup
+  :commands (emms-streams
              emms-play-dired
              emms-play-file
              emms-play-directory
-             emms-control/body))
+             db/play-playlist
+             emms-control/body)
+  :config (require 'db-emms))
 
 (use-package helm-emms
   :commands (helm-emms)
   :config (progn
-            (require 'db-emms)
+            (require 'emms-setup)
             (require 'helm-adaptive)
             (setq helm-emms-default-sources
                   '(helm-source-emms-streams
diff --git a/site-lisp/db-emms.el b/site-lisp/db-emms.el
index 072955b..c3d7f92 100644
--- a/site-lisp/db-emms.el
+++ b/site-lisp/db-emms.el
@@ -34,17 +34,15 @@
 
 ;; Setup
 
-(require 'emms)
+(message "Loading db-emms")
+
+(require 'emms-setup)
 (emms-all)
 (emms-default-players)
 
 
 ;; Basic configuration
 
-(require 'emms-source-file)
-(require 'emms-playlist-mode)
-(require 'emms-info)
-
 (setq emms-source-file-default-directory "~/Documents/media/audio/")
 
 (advice-add 'emms-tag-editor-submit
@@ -176,7 +174,6 @@ When NO-NEWLINE is non-nil, do not insert a newline after the track."
 
 ;; Streams
 
-(require 'emms-streams)
 (setq emms-stream-default-action "play")