diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index a6a23cbb376..e93afd19a74 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -716,7 +716,7 @@ EPR-21578d - NAOMI BOOT ROM 1999 06/04  1.40 (Export)
 EPR-21578a - NAOMI BOOT ROM 1999 02/15  1.20 (Export)
 EPR-21579  - No known dump (Korea)
 EPR-21580  - No known dump (Australia)
-EPR-22851  - NAOMI BOOT ROM 1999 08/30  1.35 (Multisystem 3 screen)
+EPR-22851  - NAOMI BOOT ROM 1999 08/30  1.35 (Multisystem 3 screen Ferrari F355)
 
 EPR-21577e & EPR-2178e differ by 7 bytes:
 
@@ -724,36 +724,53 @@ EPR-21577e & EPR-2178e differ by 7 bytes:
 0x1ffffa-0x1fffff is the BIOS checksum
 
 
+House of the Dead 2 specific Naomi BIOS roms:
+
+Info from roms starting at 0x1ff060
+
+EPR-21330  - HOUSE OF THE DEAD 2 IPL ROM 1998 11/14 (USA)
+EPR-21331  - HOUSE OF THE DEAD 2 IPL ROM 1998 11/14 (Export)
+
+EPR-21330 & EPR-21331 differ by 7 bytes:
+
+0x40000 is the region byte (only one region byte)
+0x1ffffa-0x1fffff is the BIOS checksum
+
+
 Region byte encoding is as follows:
 
 0x00 = Japan
 0x01 = USA
 0x02 = Export
-???? = Korea
-???? = Australia
+0x?? = Korea
+0x?? = Australia
 
 Scan ROM for the text string "LOADING TEST MODE NOW" back up four (4) bytes for the region byte.
-  NOTE: this doesn't work for the multi screen boot rom
+  NOTE: this doesn't work for the HOTD2 or multi screen boot roms
 
 */
 
 #define NAOMI_BIOS \
-	ROM_SYSTEM_BIOS( 0, "bios0", "epr-21578e" ) \
+	ROM_SYSTEM_BIOS( 0, "bios0", "epr-21578e (Export)" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 0, "epr-21578e.bin",  0x000000, 0x200000, CRC(087f09a3) SHA1(0418eb2cf9766f0b1b874a4e92528779e22c0a4a) ) \
-	ROM_SYSTEM_BIOS( 1, "bios1", "epr-21578d" ) \
+	ROM_SYSTEM_BIOS( 1, "bios1", "epr-21578d (Export)" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 1, "epr-21578d.bin",  0x000000, 0x200000, CRC(dfd5f42a) SHA1(614a0db4743a5e5a206190d6786ade24325afbfd) ) \
-	ROM_SYSTEM_BIOS( 2, "bios2", "epr-21578a" ) \
+	ROM_SYSTEM_BIOS( 2, "bios2", "epr-21578a (Export)" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 2, "epr-21578a.bin",  0x000000, 0x200000, CRC(6c9aad83) SHA1(555918de76d8dbee2a97d8a95297ef694b3e803f) ) \
-	ROM_SYSTEM_BIOS( 3, "bios3", "epr-21577e" ) \
+	ROM_SYSTEM_BIOS( 3, "bios3", "epr-21577e (USA)" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 3, "epr-21577e.bin",  0x000000, 0x200000, CRC(cf36e97b) SHA1(b085305982e7572e58b03a9d35f17ae319c3bbc6) ) \
-	ROM_SYSTEM_BIOS( 4, "bios4", "epr-21577d" ) \
+	ROM_SYSTEM_BIOS( 4, "bios4", "epr-21577d (USA)" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 4, "epr-21577d.bin",  0x000000, 0x200000, CRC(60ddcbbe) SHA1(58b15096d269d6df617ca1810b66b47deb184958) ) \
-	ROM_SYSTEM_BIOS( 5, "bios5", "epr-21576g" ) \
+	ROM_SYSTEM_BIOS( 5, "bios5", "epr-21576g (Japan)" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 5, "epr-21576g.bin",  0x000000, 0x200000, CRC(d2a1c6bf) SHA1(6d27d71aec4dfba98f66316ae74a1426d567698a) ) \
-	ROM_SYSTEM_BIOS( 6, "bios6", "epr-22851"  ) \
+	ROM_SYSTEM_BIOS( 6, "bios6", "Ferrari F355" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 6, "epr-22851.bin",   0x000000, 0x200000, CRC(62483677) SHA1(3e3bcacf5f972c376b569f45307ee7fd0b5031b7) ) \
-	ROM_SYSTEM_BIOS( 7, "bios7", "Naomi Dev BIOS" ) \
-	ROM_LOAD16_WORD_SWAP_BIOS( 7, "dcnaodev.bios",   0x000000, 0x080000, CRC(7a50fab9) SHA1(ef79f448e0bf735d1264ad4f051d24178822110f) ) /* This one comes from a dev / beta board. The eprom was a 27C4096 */
+	ROM_SYSTEM_BIOS( 7, "bios7", "HOTD2 (US)" ) \
+	ROM_LOAD16_WORD_SWAP_BIOS( 7, "epr-21330.bin",   0x000000, 0x200000, CRC(9e3bfa1b) SHA1(b539d38c767b0551b8e7956c1ff795de8bbe2fbc) ) \
+	ROM_SYSTEM_BIOS( 8, "bios8", "HOTD2 (Export)" ) \
+	ROM_LOAD16_WORD_SWAP_BIOS( 8, "epr-21331.bin",   0x000000, 0x200000, CRC(065f8500) SHA1(49a3881e8d76f952ef5e887200d77b4a415d47fe) ) \
+	ROM_SYSTEM_BIOS( 9, "bios9", "Naomi Dev BIOS" ) \
+	ROM_LOAD16_WORD_SWAP_BIOS( 9, "dcnaodev.bios",   0x000000, 0x080000, CRC(7a50fab9) SHA1(ef79f448e0bf735d1264ad4f051d24178822110f) ) /* This one comes from a dev / beta board. The eprom was a 27C4096 */
 
 
 /* NAOMI2 BIOS:
@@ -769,12 +786,9 @@ EPR-23605B, EPR-23607B & EPR-23608B all differ by 8 bytes:
 0x1ecf40 is a second region byte (value is the same as the first region byte )
 0x1fffa-1ffff is the BIOS rom checksum
 
-EPR-23605  - Japan  (region = 0x00)
-EPR-23605b - Japan  (region = 0x00)
-EPR-23607  - USA    (region = 0x01)
-EPR-23607b - USA    (region = 0x01)
-EPR-23608b - Export (region = 0x02)
-EPR-23608  - Export (region = 0x02)
+EPR-23605 & EPR-23605b - Japan  (region = 0x00)
+EPR-23607 & EPR-23607b - USA    (region = 0x01)
+EPR-23608 & EPR-23608b - Export (region = 0x02)
 
 */