diff --git a/os/arch/install b/os/arch/install
index 4f4bdb57..4af4517c 100755
--- a/os/arch/install
+++ b/os/arch/install
@@ -78,8 +78,6 @@ EOL
     $pacaur -S bspwm sxhkd compton
     # Taskbar
     $pacaur -S lemonbar-xft-git siji-git xtitle sutils-git dunst libnotify
-    # Music player
-    $pacaur -S mpd mpc ncmpcpp
     # Utilities
     $pacaur -S rofi feh sxiv maim slop-opengl neofetch-git pass youtube-dl xdotool
     # Apps
@@ -91,7 +89,6 @@ EOL
 
     systemctl enable --user redshift.service
     systemctl enable --user rslsync.service
-    systemctl enable --user mpd.service
 
     # FIXME Install pacman hooks
     hookdest=/etc/pacman.d/hooks
diff --git a/os/arch/.config/mpd/mpd.conf b/shell/mpd/.config/mpd/mpd.conf
similarity index 100%
rename from os/arch/.config/mpd/mpd.conf
rename to shell/mpd/.config/mpd/mpd.conf
diff --git a/os/arch/.ncmpcpp/bindings b/shell/mpd/.ncmpcpp/bindings
similarity index 100%
rename from os/arch/.ncmpcpp/bindings
rename to shell/mpd/.ncmpcpp/bindings
diff --git a/os/arch/.ncmpcpp/config b/shell/mpd/.ncmpcpp/config
similarity index 100%
rename from os/arch/.ncmpcpp/config
rename to shell/mpd/.ncmpcpp/config
diff --git a/shell/mpd/install b/shell/mpd/install
new file mode 100755
index 00000000..3fd32355
--- /dev/null
+++ b/shell/mpd/install
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+case $OSTYPE in
+    darwin*)
+        brew install mpd mpc
+        brew install ncmpcpp --with-clock --with-visualizer
+        brew services start mpd
+        ;;
+    linux*)
+        if [[ -f /etc/arch-version ]]; then
+            sudo pacman --needed --noconfirm -S mpd mpc ncmpcpp
+            systemctl enable --user mpd.service
+            systemctl start --user mpd.service
+        fi
+        ;;
+esac