diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 78c0a0ca8f..75f7853164 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -214,7 +214,7 @@ static int smbios_write_type3(unsigned long *current, int handle)
 	t->bootup_state = SMBIOS_STATE_SAFE;
 	t->power_supply_state = SMBIOS_STATE_SAFE;
 	t->thermal_state = SMBIOS_STATE_SAFE;
-	t->_type = 3;
+	t->_type = CONFIG_MAINBOARD_ENCLOSURE_TYPE;
 	t->security_status = SMBIOS_STATE_SAFE;
 	len = t->length + smbios_string_table_len(t->eos);
 	*current += len;
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index fb6428cab5..62ac72f0c0 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -341,4 +341,9 @@ config MAINBOARD_VERSION
 	default "1.0"
 	help
 	  Define the used version number which will be used by SMBIOS tables.
+
+config MAINBOARD_ENCLOSURE_TYPE
+	hex "System Enclosure or Chassis type"
+	depends on GENERATE_SMBIOS_TABLES
+	default 0x3
 endmenu