diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index f909ec7c846..4c4526ef930 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -51,6 +51,7 @@
 #include "sound/tms5220.h"          /* Speech */
 #include "video/saa5050.h"          /* Teletext */
 #include "bbc.lh"
+#include "bbcm.lh"
 
 /* Devices */
 #include "formats/acorn_dsk.h"
@@ -1276,7 +1277,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state )
 	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcm)
 	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcm)
 
-	MCFG_DEFAULT_LAYOUT(layout_bbc)
+	MCFG_DEFAULT_LAYOUT(layout_bbcm)
 
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/layout/bbc.lay b/src/mame/layout/bbc.lay
index bd956a79a29..9dbaccb8a7c 100644
--- a/src/mame/layout/bbc.lay
+++ b/src/mame/layout/bbc.lay
@@ -3,9 +3,12 @@
 
 <mamelayout version="2">
 
-	<element name="red_led">
-		<disk>
-			<color red="1.0" green="0.0" blue="0.0" />
+	<element name="red_led" defstate="1">
+		<disk state="0">
+			<color red="0.75" green="0.0" blue="0.0" />
+		</disk>
+		<disk state="1">
+			<color red="0.20" green="0.0" blue="0.0" />
 		</disk>
 	</element>
 
diff --git a/src/mame/layout/bbcm.lay b/src/mame/layout/bbcm.lay
new file mode 100644
index 00000000000..13382e83981
--- /dev/null
+++ b/src/mame/layout/bbcm.lay
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!-- Basic display of keyboard LEDs for the BBC Master series -->
+
+<mamelayout version="2">
+
+	<element name="red_led" defstate="1">
+		<disk state="0">
+			<color red="0.75" green="0.0" blue="0.0" />
+		</disk>
+		<disk state="1">
+			<color red="0.20" green="0.0" blue="0.0" />
+		</disk>
+	</element>
+
+	<element name="label_power">
+		<text string="power">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+
+	<element name="label_on">
+		<text string="on">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+
+	<element name="label_caps">
+		<text string="caps">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+
+	<element name="label_shift">
+		<text string="shift">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+
+	<element name="label_lock">
+		<text string="lock">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+
+	<view name="Keyboard LED's">
+		<bounds left="0" right="400" top="0" bottom="330" />
+		<screen index="0">
+			<bounds left="0" right="400" top="0" bottom="300" />
+		</screen>
+
+		<bezel name="label_power" element="label_power">
+			<bounds x="10" y="305" width="24" height="7" />
+		</bezel>
+
+		<bezel name="label_on" element="label_on">
+			<bounds x="10" y="312" width="24" height="7" />
+		</bezel>
+
+		<bezel name="power_led" element="red_led">
+			<bounds x="20" y="320" width="5" height="5" />
+		</bezel>
+
+		<bezel name="label_caps" element="label_caps">
+			<bounds x="40" y="305" width="24" height="7" />
+		</bezel>
+
+		<bezel name="label_lock" element="label_lock">
+			<bounds x="40" y="312" width="24" height="7" />
+		</bezel>
+
+		<bezel name="capslock_led" element="red_led">
+			<bounds x="50" y="320" width="5" height="5" />
+		</bezel>
+
+		<bezel name="label_shift" element="label_shift">
+			<bounds x="70" y="305" width="24" height="7" />
+		</bezel>
+
+		<bezel name="label_lock" element="label_lock">
+			<bounds x="70" y="312" width="24" height="7" />
+		</bezel>
+
+		<bezel name="shiftlock_led" element="red_led">
+			<bounds x="80" y="320" width="5" height="5" />
+		</bezel>
+	</view>
+
+</mamelayout>
diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp
index 544db8d1457..40c5874db7d 100644
--- a/src/mame/machine/bbc.cpp
+++ b/src/mame/machine/bbc.cpp
@@ -1809,6 +1809,8 @@ MACHINE_START_MEMBER(bbc_state, bbcm)
 	/* Set ROM/IO bank to point to rom */
 	m_bank8->set_base(m_region_os->base() + 0x3c00);
 	m_maincpu->space(AS_PROGRAM).install_read_bank(0xfc00, 0xfeff, "bank8");
+
+	output().set_value("power_led", 0);
 }
 
 MACHINE_RESET_MEMBER(bbc_state, bbcm)