diff --git a/configure.ac b/configure.ac
index a08bf94..ce7bc64 100755
--- a/configure.ac
+++ b/configure.ac
@@ -167,12 +167,23 @@
     [Path to the active preserved pnor partitions])
 
 # Setup ubifs layout support
-# For now make it default enabled
 AC_ARG_ENABLE([ubifs_layout],
-    AS_HELP_STRING([--disable-ubifs_layout], [Disable ubifs support.]))
-AS_IF([test "x$enable_ubifs_layout" != "xno"], \
+    AS_HELP_STRING([--enable-ubifs_layout], [Enable ubifs support.]))
+AS_IF([test "x$enable_ubifs_layout" == "xyes"], \
     [AC_DEFINE([UBIFS_LAYOUT],[],[Enable ubifs support.])])
-AM_CONDITIONAL([UBIFS_LAYOUT], [test "x$enable_ubifs_layout" != "xno"])
+AM_CONDITIONAL([UBIFS_LAYOUT], [test "x$enable_ubifs_layout" == "xyes"])
+
+# Setup MMC layout support
+AC_ARG_ENABLE([mmc_layout],
+    AS_HELP_STRING([--enable-mmc_layout], [Enable MMC support.]))
+AS_IF([test "x$enable_mmc_layout" == "xyes"], \
+    [AC_DEFINE([MMC_LAYOUT],[],[Enable MMC support.])])
+AM_CONDITIONAL([MMC_LAYOUT], [test "x$enable_mmc_layout" == "xyes"])
+
+# Setup static layout support (default)
+AS_IF([test "x$enable_ubifs_layout" != "xyes" -a "x$enable_mmc_layout" != "xyes"], \
+    [AC_DEFINE([STATIC_LAYOUT],[],[Enable static layout support.])])
+AM_CONDITIONAL([STATIC_LAYOUT], [test "x$enable_ubifs_layout" != "xyes" -a "x$enable_mmc_layout" != "xyes"])
 
 AC_ARG_VAR(ACTIVE_PNOR_MAX_ALLOWED, [The maximum allowed active pnor versions])
 AS_IF([test "x$ACTIVE_PNOR_MAX_ALLOWED" == "x"], [ACTIVE_PNOR_MAX_ALLOWED=2])