diff --git a/common/recipes-phosphor/flash/obmc-flash-bios.bb b/common/recipes-phosphor/flash/obmc-flash-bios.bb
index 9fdd7e3..7398cbd 100644
--- a/common/recipes-phosphor/flash/obmc-flash-bios.bb
+++ b/common/recipes-phosphor/flash/obmc-flash-bios.bb
@@ -13,3 +13,4 @@
 DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service"
 SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service"
 SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubiattach.service"
+SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubimount@.service"
diff --git a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service
new file mode 100644
index 0000000..331ed6b
--- /dev/null
+++ b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Mount UBIFS volume pnor-rw%I
+Requires=obmc-flash-bios-ubiattach.service
+After=obmc-flash-bios-ubiattach.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/sh -c '{sbindir}ubimkvol /dev/ubi0 -N pnor-rw%i -s 1MiB; \
+                      mkdir /media/pnor-rw%i; \
+                      mount -t ubifs ubi0:pnor-rw%i /media/pnor-rw%i'