diff --git a/common/recipes-phosphor/events/obmc-phosphor-event.bb b/common/recipes-phosphor/events/obmc-phosphor-event.bb
index bba2a64..bd4d678 100644
--- a/common/recipes-phosphor/events/obmc-phosphor-event.bb
+++ b/common/recipes-phosphor/events/obmc-phosphor-event.bb
@@ -6,20 +6,21 @@
 
 inherit obmc-phosphor-license
 inherit obmc-phosphor-event-mgmt
-inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-dbus-service
 inherit obmc-phosphor-c-daemon
 
 TARGET_CXXFLAGS += " -std=c++11 -fpic"
 TARGET_CFLAGS += " -fpic"
 
 SRC_URI += "git://github.com/openbmc/phosphor-event"
-SRC_URI += "file://eventd.conf"
 
 SRCREV = "059b35e1eabdd87ad02b4343692789386c134082"
 
 RDEPENDS_${PN} += "libsystemd"
 DEPENDS += "systemd"
 
+DBUS_SERVICE_${PN} = "org.openbmc.records.events.service"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/eventd/eventd.conf"
 
 S = "${WORKDIR}/git"
 INSTALL_NAME = "event_messaged"
@@ -27,7 +28,5 @@
 do_install() {
         install -d ${D}/var/lib/obmc/events/
         install -m 0755 -d ${D}${sbindir}
-        install -m 0755 ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-eventd
-        install -m 0755 -d ${D}${sysconfdir}/default/eventd
-        install -m 0644 ${WORKDIR}/eventd.conf ${D}${sysconfdir}/default/eventd/eventd.conf
+        install -m 0755 ${S}/${INSTALL_NAME} ${D}/${sbindir}/phosphor-eventd
 }
diff --git a/common/recipes-phosphor/events/obmc-phosphor-event/obmc-phosphor-event.service b/common/recipes-phosphor/events/obmc-phosphor-event/obmc-phosphor-event.service
deleted file mode 100644
index 696d2b1..0000000
--- a/common/recipes-phosphor/events/obmc-phosphor-event/obmc-phosphor-event.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Phosphor Event Manager
-
-[Service]
-EnvironmentFile=-/etc/default/eventd/eventd.conf
-Restart=always
-ExecStart={sbindir}/obmc-phosphor-eventd $OPTIONS
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/events/obmc-phosphor-event/obmc/eventd/eventd.conf b/common/recipes-phosphor/events/obmc-phosphor-event/obmc/eventd/eventd.conf
new file mode 100644
index 0000000..b50dfbc
--- /dev/null
+++ b/common/recipes-phosphor/events/obmc-phosphor-event/obmc/eventd/eventd.conf
@@ -0,0 +1,4 @@
+LOG_SIZE_LIMIT="197376"
+LOG_COUNT_LIMIT="128"
+
+OPTIONS="-s ${LOG_SIZE_LIMIT} -t ${LOG_COUNT_LIMIT}"
diff --git a/common/recipes-phosphor/events/obmc-phosphor-event/org.openbmc.records.events.service b/common/recipes-phosphor/events/obmc-phosphor-event/org.openbmc.records.events.service
new file mode 100644
index 0000000..2af0136
--- /dev/null
+++ b/common/recipes-phosphor/events/obmc-phosphor-event/org.openbmc.records.events.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Phosphor Event Manager
+
+[Service]
+EnvironmentFile={envfiledir}/obmc/eventd/eventd.conf
+Restart=always
+ExecStart={sbindir}/phosphor-eventd $OPTIONS
+Type=dbus
+BusName={BUSNAME}
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}