diff --git a/control/Makefile.am b/control/Makefile.am
index 45ffc96..7510e1e 100644
--- a/control/Makefile.am
+++ b/control/Makefile.am
@@ -4,6 +4,17 @@
 	-I${srcdir}/json/actions \
 	-I${srcdir}/json/triggers
 
+systemdsystemunit_DATA=
+
+if WANT_JSON_CONTROL
+systemdsystemunit_DATA += \
+	service_files/json/phosphor-fan-control@.service
+else
+systemdsystemunit_DATA += \
+	service_files/yaml/phosphor-fan-control@.service \
+	service_files/yaml/phosphor-fan-control-init@.service
+endif
+
 bin_PROGRAMS = \
 	phosphor-fan-control
 
diff --git a/control/service_files/json/phosphor-fan-control@.service.in b/control/service_files/json/phosphor-fan-control@.service.in
new file mode 100644
index 0000000..9b305cd
--- /dev/null
+++ b/control/service_files/json/phosphor-fan-control@.service.in
@@ -0,0 +1,6 @@
+[Unit]
+Description=Phosphor Fan Control Daemon
+
+[Service]
+Restart=on-failure
+ExecStart=@BINDIR@/phosphor-fan-control
diff --git a/control/service_files/yaml/phosphor-fan-control-init@.service.in b/control/service_files/yaml/phosphor-fan-control-init@.service.in
new file mode 100644
index 0000000..d3563a5
--- /dev/null
+++ b/control/service_files/yaml/phosphor-fan-control-init@.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=Phosphor Fan Control Initialization
+Wants=obmc-power-on@%i.target
+After=obmc-power-on@%i.target
+Conflicts=obmc-chassis-powered-off@%i.target
+
+[Service]
+Restart=on-failure
+ExecStart=@BINDIR@/phosphor-fan-control --init
+SyslogIdentifier=phosphor-fan-control
+
+[Install]
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/control/service_files/yaml/phosphor-fan-control@.service.in b/control/service_files/yaml/phosphor-fan-control@.service.in
new file mode 100644
index 0000000..9f7e73a
--- /dev/null
+++ b/control/service_files/yaml/phosphor-fan-control@.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Phosphor Fan Control Daemon
+Conflicts=obmc-chassis-powered-off@%i.target
+
+[Service]
+Restart=on-failure
+ExecStart=@BINDIR@/phosphor-fan-control --control
+SyslogIdentifier=phosphor-fan-control
+
+[Install]
+RequiredBy=obmc-fan-control-ready@%i.target