diff --git a/lib/boot_data.py b/lib/boot_data.py
index c036dc8..35de01c 100755
--- a/lib/boot_data.py
+++ b/lib/boot_data.py
@@ -72,7 +72,13 @@
                     if sub_state.startswith("os_"):
                         boot_table[boot][state_key].pop(sub_state, None)
 
-    return boot_table
+    # For every boot_type we should have a corresponding mfg mode boot type.
+    enhanced_boot_table = DotDict()
+    for key, value in boot_table.iteritems():
+        enhanced_boot_table[key] = value
+        enhanced_boot_table[key + " (mfg)"] = value
+
+    return enhanced_boot_table
 
 ###############################################################################