diff --git a/meta-google/recipes-google/systemd/files/gbmc-log-ramoops.service b/meta-google/recipes-google/systemd/files/gbmc-log-ramoops.service
new file mode 100644
index 0000000..474ed6f
--- /dev/null
+++ b/meta-google/recipes-google/systemd/files/gbmc-log-ramoops.service
@@ -0,0 +1,8 @@
+[Service]
+Type=oneshot
+SyslogIdentifier=gbmc-log-ramoops
+SyslogLevelPrefix=true
+ExecStart=/usr/bin/find /sys/fs/pstore -name '*-*' -print -exec cat {} \;
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
index 4a6f194..68052e9 100644
--- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
+++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
@@ -10,6 +10,7 @@
 SRC_URI:append = " \
   file://firmware-updates.target \
   file://firmware-updates-pre.target \
+  file://gbmc-log-ramoops.service \
   file://40-gbmc-forward.conf \
   file://40-gbmc-time.conf \
   "
@@ -28,6 +29,7 @@
 SYSTEMD_SERVICE:${PN}:append = " \
   firmware-updates.target \
   firmware-updates-pre.target \
+  gbmc-log-ramoops.service \
   "
 
 # Put coredumps in the journal to ensure they stay in ram
@@ -43,6 +45,11 @@
   install -d -m 0755 ${D}${systemd_system_unitdir}
   install -m 0644 ${WORKDIR}/firmware-updates.target ${D}${systemd_system_unitdir}/
   install -m 0644 ${WORKDIR}/firmware-updates-pre.target ${D}${systemd_system_unitdir}/
+  install -m 0644 ${WORKDIR}/gbmc-log-ramoops.service ${D}${systemd_system_unitdir}/
+
+  # mask systemd-pstore.service to avoid copying logs to SPI
+  mkdir -p ${D}${sysconfdir}/systemd/system
+  ln -sv /dev/null ${D}${sysconfdir}/systemd/system/systemd-pstore.service
 
   install -d -m0755 ${D}${libdir}/sysctl.d
   install -m 0644 ${WORKDIR}/40-gbmc-forward.conf ${D}${libdir}/sysctl.d/