diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/common/recipes-phosphor/sensors/phosphor-hwmon.bb
index f6276fa..984aabf 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon.bb
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon.bb
@@ -5,7 +5,9 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig obmc-phosphor-systemd
+
+SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Hwmon@.service"
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "sdbusplus"
@@ -15,7 +17,14 @@
         "
 
 SRC_URI += "git://github.com/openbmc/phosphor-hwmon"
+SRC_URI += "file://70-hwmon.rules"
 
 SRCREV = "8d89325adccbf7616e34210bb15ec3bebe17fcfe"
 
 S = "${WORKDIR}/git"
+
+do_install_append() {
+
+	install -d ${D}/${base_libdir}/udev/rules.d/
+	install ${WORKDIR}/70-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
+}
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
new file mode 100644
index 0000000..070d88f
--- /dev/null
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="hwmon", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
new file mode 100644
index 0000000..fcfada6
--- /dev/null
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor Hwmon Poller
+ConditionFileNotEmpty=/etc/default/obmc/hwmon/%I.conf
+
+[Service]
+Restart=always
+ExecStart={sbindir}/phosphor-hwmon-readd -o %f
+EnvironmentFile=/etc/default/obmc/hwmon/%I.conf