diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass
new file mode 100644
index 0000000..808e689
--- /dev/null
+++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass
@@ -0,0 +1,6 @@
+PACKAGECONFIG_append = " mmc_layout"
+
+SYSTEMD_SERVICE_${PN} += " \
+    obmc-flash-bios-init.service \
+    obmc-flash-bios-patch.service \
+"
diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
index a0873b4..4306ff9 100644
--- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
+++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
@@ -11,15 +11,29 @@
 inherit autotools pkgconfig systemd
 inherit obmc-phosphor-dbus-service
 
+# Static configuration. This is the default if no other layout is specified.
+inherit ${@bb.utils.contains_any('DISTRO_FEATURES', \
+        'openpower-ubi-fs phosphor-mmc', \
+        '', \
+        'openpower-software-manager-static', d)}
+
+# UBI layout
 inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', \
                              'openpower-software-manager-ubi', \
-                             'openpower-software-manager-static', d)}
+                             '', d)}
+# eMMC layout
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'phosphor-mmc', \
+                             'openpower-software-manager-mmc', \
+                             '', d)}
+
+# Virtual PNOR
 inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \
                              'openpower-software-manager-virtual-pnor', \
                              '', d)}
 
 PACKAGECONFIG[verify_pnor_signature] = "--enable-verify_pnor_signature,--disable-verify_pnor_signature"
 PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout,--disable-ubifs_layout,,mtd-utils-ubifs"
+PACKAGECONFIG[mmc_layout] = "--enable-mmc_layout,--disable-mmc_layout"
 PACKAGECONFIG[virtual_pnor] = "--enable-virtual_pnor,--disable-virtual_pnor"
 
 EXTRA_OECONF += " \