diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h
index 95a553cc..4f56f3e9 100644
--- a/src/include/ipxe/settings.h
+++ b/src/include/ipxe/settings.h
@@ -452,6 +452,16 @@ extern const struct setting
 busid_setting __setting ( SETTING_NETDEV, busid );
 extern const struct setting
 user_class_setting __setting ( SETTING_HOST_EXTRA, user-class );
+extern const struct setting
+manufacturer_setting __setting ( SETTING_HOST_EXTRA, manufacturer );
+extern const struct setting
+product_setting __setting ( SETTING_HOST_EXTRA, product );
+extern const struct setting
+serial_setting __setting ( SETTING_HOST_EXTRA, serial );
+extern const struct setting
+asset_setting __setting ( SETTING_HOST_EXTRA, asset );
+extern const struct setting
+board_serial_setting __setting ( SETTING_HOST_EXTRA, board-serial );
 
 /**
  * Initialise a settings block
diff --git a/src/interface/smbios/smbios_settings.c b/src/interface/smbios/smbios_settings.c
index 5eadfa08..2d571f2e 100644
--- a/src/interface/smbios/smbios_settings.c
+++ b/src/interface/smbios/smbios_settings.c
@@ -248,7 +248,7 @@ const struct setting asset_setting __setting ( SETTING_HOST_EXTRA, asset ) = {
 
 /** Board serial number setting (may differ from chassis serial number) */
 const struct setting board_serial_setting __setting ( SETTING_HOST_EXTRA,
-						      board_serial ) = {
+						      board-serial ) = {
 	.name = "board-serial",
 	.description = "Base board serial",
 	.tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_BASE_BOARD_INFORMATION,