diff --git a/configure.ac b/configure.ac
index 9523a0b..ff87337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,7 +277,7 @@
                        [$SHUTDOWN_ALARM_SOFT_SHUTDOWN_DELAY_MS],
                        [Milliseconds to delay the alarm soft shutdown])
 
-    AC_CONFIG_FILES([sensor-monitor/Makefile])
+    AC_CONFIG_FILES([sensor-monitor/Makefile sensor-monitor/service_files/sensor-monitor.service])
 ])
 
 eval "eval BINDIR=$bindir"
diff --git a/sensor-monitor/Makefile.am b/sensor-monitor/Makefile.am
index 2cd7e7d..da19997 100644
--- a/sensor-monitor/Makefile.am
+++ b/sensor-monitor/Makefile.am
@@ -4,6 +4,9 @@
 bin_PROGRAMS = \
 	sensor-monitor
 
+systemdsystemunit_DATA = \
+	service_files/sensor-monitor.service
+
 sensor_monitor_SOURCES = \
     shutdown_alarm_monitor.cpp \
 	main.cpp
diff --git a/sensor-monitor/service_files/sensor-monitor.service.in b/sensor-monitor/service_files/sensor-monitor.service.in
new file mode 100644
index 0000000..6d19e4e
--- /dev/null
+++ b/sensor-monitor/service_files/sensor-monitor.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=Sensor Monitor
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
+Wants=obmc-mapper.target
+After=obmc-mapper.target
+
+[Service]
+Restart=always
+ExecStart=@BINDIR@/sensor-monitor
+
+[Install]
+WantedBy=multi-user.target