diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 475486173c8..50b1b5ee0f2 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1841,9 +1841,9 @@ if CPUS["M6809"] then
 	}
 
 	custombuildtask {
-		{ MAME_DIR .. "src/devices/cpu/m6809/m6809.ops"  , GEN_DIR .. "emu/cpu/m6809/m6809.hxx",   { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py"  , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops"  }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
-		{ MAME_DIR .. "src/devices/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.hxx",  { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py"  , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops"  }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
-		{ MAME_DIR .. "src/devices/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.hxx",  { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py"  , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops"  }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }},
+		{ MAME_DIR .. "src/devices/cpu/m6809/m6809.lst"  , GEN_DIR .. "emu/cpu/m6809/m6809.hxx",   { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py"  , MAME_DIR .. "src/devices/cpu/m6809/base6x09.lst"  }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
+		{ MAME_DIR .. "src/devices/cpu/m6809/hd6309.lst" , GEN_DIR .. "emu/cpu/m6809/hd6309.hxx",  { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py"  , MAME_DIR .. "src/devices/cpu/m6809/base6x09.lst"  }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
+		{ MAME_DIR .. "src/devices/cpu/m6809/konami.lst" , GEN_DIR .. "emu/cpu/m6809/konami.hxx",  { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py"  , MAME_DIR .. "src/devices/cpu/m6809/base6x09.lst"  }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }},
 	}
 end
 
diff --git a/src/devices/cpu/m6809/base6x09.ops b/src/devices/cpu/m6809/base6x09.lst
similarity index 100%
rename from src/devices/cpu/m6809/base6x09.ops
rename to src/devices/cpu/m6809/base6x09.lst
diff --git a/src/devices/cpu/m6809/hd6309.ops b/src/devices/cpu/m6809/hd6309.lst
similarity index 99%
rename from src/devices/cpu/m6809/hd6309.ops
rename to src/devices/cpu/m6809/hd6309.lst
index 531828c1c46..becb5c09d4b 100644
--- a/src/devices/cpu/m6809/hd6309.ops
+++ b/src/devices/cpu/m6809/hd6309.lst
@@ -515,7 +515,7 @@ DISPATCH11:
 	}
 	return;
 
-#include "base6x09.ops"
+#include "base6x09.lst"
 
 PUSH_REGISTERS:
 	if (m_temp.w & 0x80)
diff --git a/src/devices/cpu/m6809/konami.ops b/src/devices/cpu/m6809/konami.lst
similarity index 99%
rename from src/devices/cpu/m6809/konami.ops
rename to src/devices/cpu/m6809/konami.lst
index 00e1d910a86..f2f47089cdd 100644
--- a/src/devices/cpu/m6809/konami.ops
+++ b/src/devices/cpu/m6809/konami.lst
@@ -74,8 +74,8 @@ MAIN:
 		case 0x39:                                      %INDEXED;   %SETLINE;   return;
 		case 0x3A:              set_regop8(m_q.r.a);    %INDEXED;   %ST8;       return;
 		case 0x3B:              set_regop8(m_q.r.b);    %INDEXED;   %ST8;       return;
-		case 0x3C:              set_imm();                          %ANDCC;     return;
-		case 0x3D:              set_imm();                          %ORCC;      return;
+		case 0x3C:                                      set_imm();  %ANDCC;     return;
+		case 0x3D:                                      set_imm();  %ORCC;      return;
 		case 0x3E:                                                  %EXG;       return;
 		case 0x3F:                                                  %TFR;       return;
 
@@ -233,7 +233,7 @@ MAIN:
 	}
 	return;
 
-#include "base6x09.ops"
+#include "base6x09.lst"
 
 PUSH_REGISTERS:
 	if (m_temp.w & 0x80)
diff --git a/src/devices/cpu/m6809/m6809.ops b/src/devices/cpu/m6809/m6809.lst
similarity index 99%
rename from src/devices/cpu/m6809/m6809.ops
rename to src/devices/cpu/m6809/m6809.lst
index b6e40530880..18527afac31 100644
--- a/src/devices/cpu/m6809/m6809.ops
+++ b/src/devices/cpu/m6809/m6809.lst
@@ -340,7 +340,7 @@ DISPATCH11:
 	}
 	return;
 
-#include "base6x09.ops"
+#include "base6x09.lst"
 
 PUSH_REGISTERS:
 	if (m_temp.w & 0x80)