diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fa7a58..2f631b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,7 @@
 set (
     SERVICE_FILES
     ${PROJECT_SOURCE_DIR}/service_files/xyz.openbmc_project.Chassis.Buttons.service
+    ${PROJECT_SOURCE_DIR}/service_files/phosphor-button-handler.service
 )
 
 install (FILES ${SERVICE_FILES} DESTINATION /lib/systemd/system/)
diff --git a/service_files/phosphor-button-handler.service b/service_files/phosphor-button-handler.service
new file mode 100644
index 0000000..3771f62
--- /dev/null
+++ b/service_files/phosphor-button-handler.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Phosphor Button Handler
+Wants=xyz.openbmc_project.Chassis.Buttons.service
+After=xyz.openbmc_project.Chassis.Buttons.service
+Wants=obmc-mapper.target
+After=obmc-mapper.target
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/env button-handler
+SyslogIdentifier=button-handler
+
+[Install]
+WantedBy=obmc-standby.target
+