diff --git a/.gitattributes b/.gitattributes
index 17f148c9478..64383595177 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3617,6 +3617,8 @@ src/mame/layout/connect4.lay svneol=native#text/plain
src/mame/layout/contcirc.lay svneol=native#text/plain
src/mame/layout/copsnrob.lay svneol=native#text/plain
src/mame/layout/crash.lay svneol=native#text/plain
+src/mame/layout/crmaze2p.lay svneol=native#text/plain
+src/mame/layout/crmaze4p.lay svneol=native#text/plain
src/mame/layout/crsbingo.lay svneol=native#text/plain
src/mame/layout/crusnexo.lay svneol=native#text/plain
src/mame/layout/darius.lay svneol=native#text/plain
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index a85086cbf8d..0ce81320515 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -49,6 +49,7 @@ TODO (game-specific):
- Derby Owner Club: if you try to start a game, it moans about something and enters into some kind of JP test mode, pretty bogus behaviour;
- Ferrari 355 Challenge: dies at the network check;
- Giant Gram 2: no VMU emulation;
+ - Idol Janshi Suchie-Pai 3: returns "i/o board error" msg in game mode;
- Oinori-Daimyoujin Matsuri: reports "B. RAM error" in test mode, inputs doesn't seem to work after that point;
- OutTrigger: crashes on naomibd_r();
- Ringout 4x4: needs cabinet set to 4p, moans about not having two jamma i/o boards;
diff --git a/src/mame/layout/crmaze2p.lay b/src/mame/layout/crmaze2p.lay
new file mode 100644
index 00000000000..60e209e6e1c
--- /dev/null
+++ b/src/mame/layout/crmaze2p.lay
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/crmaze4p.lay b/src/mame/layout/crmaze4p.lay
new file mode 100644
index 00000000000..86ba9f6ecf0
--- /dev/null
+++ b/src/mame/layout/crmaze4p.lay
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+