diff --git a/src/ints/bios.cpp b/src/ints/bios.cpp
index 47f02987..c2b087ae 100644
--- a/src/ints/bios.cpp
+++ b/src/ints/bios.cpp
@@ -1248,10 +1248,16 @@ public:
 		}
 		// PS2 mouse
 		config |= 0x04;
+		// DMA *not* supported - Ancient Art of War CGA uses this to identify PCjr
+		if (machine==MCH_PCJR) config |= 0x100;
 		// Gameport
 		config |= 0x1000;
 		mem_writew(BIOS_CONFIGURATION,config);
 		CMOS_SetRegister(0x14,(Bit8u)(config&0xff)); //Should be updated on changes
+		/* Setup PC speaker initial state - real BIOS does this for POST beeps */
+		IO_Write(0x43,0xb6); // PIT 2 mode 3
+		IO_Write(0x42,0x28); // counter 1320
+		IO_Write(0x42,0x05);
 		/* Setup extended memory size */
 		IO_Write(0x70,0x30);
 		size_extended=IO_Read(0x71);