diff --git a/systemd/system/mctp-demux.service b/systemd/system/mctp-demux.service
index c13e871..afe70bf 100644
--- a/systemd/system/mctp-demux.service
+++ b/systemd/system/mctp-demux.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=MCTP demultiplexer daemon
-Wants=pldmd.service
-Before=pldmd.service
 
 [Service]
 Restart=always
@@ -9,6 +7,3 @@
 EnvironmentFile=-/etc/default/mctp
 ExecStart=/usr/bin/mctp-demux-daemon $DEMUX_BINDING_OPTS
 SyslogIdentifier=mctp-demux
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/system/mctp-demux.socket b/systemd/system/mctp-demux.socket
new file mode 100644
index 0000000..8b42b5d
--- /dev/null
+++ b/systemd/system/mctp-demux.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=MCTP demux Unix domain socket
+
+[Socket]
+ListenSequentialPacket=@mctp-mux
+Accept=no
+
+[Install]
+WantedBy=sockets.target