diff --git a/tasks/mpd.yml b/tasks/mpd.yml
index 348eac3..07f9d02 100644
--- a/tasks/mpd.yml
+++ b/tasks/mpd.yml
@@ -19,6 +19,12 @@
       owner: 'root',
       group: 'root',
     }
+    - {
+      path: '/etc/systemd/system/mpd.socket.d',
+      mode: 755,
+      owner: 'root',
+      group: 'root',
+    }
   notify: restart mpd service
 
 - name: copy mpd templates
@@ -31,12 +37,19 @@
     group: '{{ item.group }}'
   loop:
     - {
-      src: 'templates/systemd/mpd.j2',
+      src: 'templates/systemd/mpd/service.j2',
       dest: '/etc/systemd/system/mpd.service.d/override.conf',
       mode: 755,
       owner: 'root',
       group: 'root',
     }
+    - {
+      src: 'templates/systemd/mpd/socket.j2',
+      dest: '/etc/systemd/system/mpd.socket.d/override.conf',
+      mode: 755,
+      owner: 'root',
+      group: 'root',
+    }
     - {
       src: 'templates/mpd.j2',
       dest: '{{ ansible_env.HOME }}/.config/mpd/mpd.conf',
diff --git a/templates/systemd/mpd.j2 b/templates/systemd/mpd/service.j2
similarity index 100%
rename from templates/systemd/mpd.j2
rename to templates/systemd/mpd/service.j2
diff --git a/templates/systemd/mpd/socket.j2 b/templates/systemd/mpd/socket.j2
new file mode 100644
index 0000000..fd4aff5
--- /dev/null
+++ b/templates/systemd/mpd/socket.j2
@@ -0,0 +1,6 @@
+# {{ ansible_managed }}
+
+[Socket]
+# should match configuration port
+ListenStream=
+ListenStream={{ mpd_port }}