diff --git a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
index 763bddd6d0..a6fda6a31d 100644
--- a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -39,6 +39,7 @@ namespace BizHawk.Client.EmuHawk
 			{ "A78", "Atari 7800" },
 			{ "Coleco", "Colecovision" },
 			{ "GBA", "GBA" },
+			{ "NDS", "Nintendo DS" },
 			{ "TI83", "TI-83" },
 			{ "INTV", "Intellivision" },
 			{ "C64", "C64" },
diff --git a/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs b/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
index 266106d175..f2f143cb10 100644
--- a/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
+++ b/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
@@ -42,6 +42,11 @@ namespace BizHawk.Emulation.Common
 			Option("GBA", "Bios", gbaNormal);
 			Option("GBA", "Bios", gbaJDebug);
 
+			FirmwareAndOption("24F67BDEA115A2C847C8813A262502EE1607B7DF", 16384, "NDS", "bios7", "bios7.bin", "ARM7 BIOS");
+			FirmwareAndOption("BFAAC75F101C135E32E2AAF541DE6B1BE4C8C62D", 4096, "NDS", "bios9", "bios9.bin", "ARM9 BIOS");
+			// NDS firmware dump contains user settings, so hashes are not expected to match
+			FirmwareAndOption("0000000000000000000000000000000000000000", 262144, "NDS", "firmware", "firmware.bin", "NDS Firmware");
+
 			FirmwareAndOption("E4ED47FAE31693E016B081C6BDA48DA5B70D7CCB", 512, "Lynx", "Boot", "lynxboot.img", "Boot Rom");
 
 			////FirmwareAndOption("24F67BDEA115A2C847C8813A262502EE1607B7DF", "NDS", "Bios_Arm7", "biosnds7.rom", "ARM7 Bios");