diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service b/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service
new file mode 100644
index 0000000..7cc95a0
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Install iotool links
+
+[Service]
+RemainAfterExit=no
+Type=oneshot
+ExecStart=/usr/bin/env iotools --make-links
+SystlogIdentifier=iotools
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb
index 0fc872d..2a39286 100644
--- a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb
+++ b/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb
@@ -6,6 +6,8 @@
 SRC_URI = "git://git@github.com/jonmayergoogle/iotools.git;protocol=https"
 PV = "v1.6+git${SRCPV}"
 
+inherit obmc-phosphor-systemd
+
 S = "${WORKDIR}/git"
 FILES_${PN} = "${sbindir}"
 
@@ -20,3 +22,5 @@
     install -d ${D}${sbindir}
     install -m 0755 iotools ${D}${sbindir}
 }
+
+SYSTEMD_SERVICE_${PN} += "iotools-setup.service"