diff --git a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
index bee5a5f..e9f35d4 100644
--- a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
@@ -1,4 +1,4 @@
 # Set MaxBootCycleCount to 5 on IBM systems
-EXTRA_OECMAKE:append:p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5"
-EXTRA_OECMAKE:append:witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5"
+EXTRA_OEMESON:append:p10bmc = "-Dmax-boot-cycle-count=5"
+EXTRA_OEMESON:append:witherspoon-tacoma = "-Dmax-boot-cycle-count=5"
 
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb
index 28c835a..9551f5c 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb
@@ -4,7 +4,7 @@
 in a file under /var/lib for history."
 
 SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git"
-SRCREV = "c4440ebefb36d4c2eebd3d0bdf0ce4671f04a158"
+SRCREV = "84855abe9efea81f2ed8cf025892a7400edc9d74"
 
 S = "${WORKDIR}/git"
 
@@ -13,14 +13,15 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-inherit cmake pkgconfig systemd
+inherit meson pkgconfig systemd
 
 
 def get_service(d):
+    service_list = "xyz.openbmc_project.State.Boot.PostCode.service xyz.openbmc_project.State.Boot.PostCode@.service "
     if(d.getVar('OBMC_HOST_INSTANCES') == '0'):
-      return "xyz.openbmc_project.State.Boot.PostCode.service"
+      return service_list
     else:
-      return " ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()])
+      return service_list+" ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()])
 
 SYSTEMD_SERVICE:${PN} = "${@get_service(d)}"
 
@@ -28,7 +29,6 @@
     sdbusplus \
     phosphor-dbus-interfaces \
     phosphor-logging \
+    libcereal \
     "
 
-FILES:${PN}  += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode@.service"
-FILES:${PN}  += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode.service"