diff --git a/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
index 79a848a..5ad582f 100644
--- a/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
+++ b/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
@@ -4,6 +4,3 @@
 [Service]
 Restart=always
 ExecStart=/usr/sbin/rest-dbus
-
-[Install]
-WantedBy=multi-user.target
diff --git a/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket b/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket
new file mode 100644
index 0000000..89f99b8
--- /dev/null
+++ b/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=DBUS introspecting REST server socket.
+
+[Socket]
+ListenStream=3000
+
+[Install]
+WantedBy=sockets.target
diff --git a/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/common/recipes-phosphor/rest-dbus/rest-dbus.bb
index 7f990aa..afee21c 100644
--- a/common/recipes-phosphor/rest-dbus/rest-dbus.bb
+++ b/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -16,11 +16,12 @@
         pyphosphor \
         "
 
+SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket"
+
 SRC_URI += " \
         git://github.com/openbmc/rest-dbus.git \
-        file://rest-dbus.service \
         "
 
-SRCREV = "64077101d9f2b6e51c897db82ffc0a399a34d15b"
+SRCREV = "5a65d2f605494d5c308171ba4fd1ab08d7b3a91d"
 
 S = "${WORKDIR}/git"