diff --git a/.gitattributes b/.gitattributes
index b998862313f..e69e38713d8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -136,9 +136,6 @@ src/emu/cpu/i386/i386ops.h svneol=native#text/plain
 src/emu/cpu/i386/i486ops.c svneol=native#text/plain
 src/emu/cpu/i386/pentops.c svneol=native#text/plain
 src/emu/cpu/i386/x87ops.c svneol=native#text/plain
-src/emu/cpu/i8039/8039dasm.c svneol=native#text/plain
-src/emu/cpu/i8039/i8039.c svneol=native#text/plain
-src/emu/cpu/i8039/i8039.h svneol=native#text/plain
 src/emu/cpu/i8051/8051dasm.c svneol=native#text/plain
 src/emu/cpu/i8051/i8051.c svneol=native#text/plain
 src/emu/cpu/i8051/i8051.h svneol=native#text/plain
@@ -276,6 +273,9 @@ src/emu/cpu/mc68hc11/hc11ops.c svneol=native#text/plain
 src/emu/cpu/mc68hc11/hc11ops.h svneol=native#text/plain
 src/emu/cpu/mc68hc11/mc68hc11.c svneol=native#text/plain
 src/emu/cpu/mc68hc11/mc68hc11.h svneol=native#text/plain
+src/emu/cpu/mcs48/mcs48.c svneol=native#text/plain
+src/emu/cpu/mcs48/mcs48.h svneol=native#text/plain
+src/emu/cpu/mcs48/mcs48dsm.c svneol=native#text/plain
 src/emu/cpu/minx/minx.c svneol=native#text/plain
 src/emu/cpu/minx/minx.h svneol=native#text/plain
 src/emu/cpu/minx/minxd.c svneol=native#text/plain
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index 4080fa5c9c3..909f5fc1633 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -619,13 +619,13 @@ CPUDEFS += -DHAS_N7751=$(if $(filter N7751,$(CPUS)),1,0)
 CPUDEFS += -DHAS_M58715=$(if $(filter M58715,$(CPUS)),1,0)
 
 ifneq ($(filter I8035 I8041 I8048 I8648 I8748 MB8884 I8039 I8049 I8749 N7751 M58715,$(CPUS)),)
-OBJDIRS += $(CPUOBJ)/i8039
-CPUOBJS += $(CPUOBJ)/i8039/i8039.o
-DBGOBJS += $(CPUOBJ)/i8039/8039dasm.o
+OBJDIRS += $(CPUOBJ)/mcs48
+CPUOBJS += $(CPUOBJ)/mcs48/mcs48.o
+DBGOBJS += $(CPUOBJ)/mcs48/mcs48dsm.o
 endif
 
-$(CPUOBJ)/i8039/i8039.o:	$(CPUSRC)/i8039/i8039.c \
-							$(CPUSRC)/i8039/i8039.h
+$(CPUOBJ)/mcs48/mcs48.o:	$(CPUSRC)/mcs48/mcs48.c \
+							$(CPUSRC)/mcs48/mcs48.h
 
 
 
diff --git a/src/emu/cpu/i8039/i8039.c b/src/emu/cpu/mcs48/mcs48.c
similarity index 99%
rename from src/emu/cpu/i8039/i8039.c
rename to src/emu/cpu/mcs48/mcs48.c
index 312d3c6706a..da3e93b1a71 100644
--- a/src/emu/cpu/i8039/i8039.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- *                      Intel 8039 Portable Emulator                        *
+ *                     Intel MCS-48 Portable Emulator                       *
  *                                                                          *
- *                   Copyright Mirko Buffoni                             *
- *  Based on the original work Copyright Dan Boris, an 8048 emulator     *
+ *                   Copyright Mirko Buffoni                                *
+ *  Based on the original work Copyright Dan Boris, an 8048 emulator        *
  *      You are not allowed to distribute this software commercially        *
  *        Please, notify me, if you make any changes to this file           *
  *                                                                          *
@@ -58,7 +58,7 @@
 
 
 #include "debugger.h"
-#include "i8039.h"
+#include "mcs48.h"
 
 
 /*** Cycle times for the jump on condition instructions, are unusual.
diff --git a/src/emu/cpu/i8039/i8039.h b/src/emu/cpu/mcs48/mcs48.h
similarity index 100%
rename from src/emu/cpu/i8039/i8039.h
rename to src/emu/cpu/mcs48/mcs48.h
diff --git a/src/emu/cpu/i8039/8039dasm.c b/src/emu/cpu/mcs48/mcs48dsm.c
similarity index 100%
rename from src/emu/cpu/i8039/8039dasm.c
rename to src/emu/cpu/mcs48/mcs48dsm.c
diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c
index ecc0867dc6f..366b906df2b 100644
--- a/src/ldplayer/ldplayer.c
+++ b/src/ldplayer/ldplayer.c
@@ -11,7 +11,7 @@
 
 #include "driver.h"
 #include "uimenu.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "machine/laserdsc.h"
 #include <ctype.h>
 
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index 6b5fceb345c..08c6faa04dc 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -37,7 +37,7 @@
 /*****************************************************************************/
 
 #include "driver.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
 #include "includes/vicdual.h"
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 4cee4f1f851..e73684a61fe 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1,5 +1,5 @@
 #include "driver.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/nes_apu.h"
 #include "sound/discrete.h"
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 048f241e069..9449df0af3c 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -1,5 +1,5 @@
 #include "driver.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 #include "sound/ay8910.h"
 #include "sound/discrete.h"
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 8fbeb18d12b..278e3e06a02 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -6,7 +6,7 @@
 
 #include "driver.h"
 #include "deprecat.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/sn76477.h"
 #include "sound/dac.h"
 #include "includes/n8080.h"
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 0b7969bdae0..88212431a93 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -10,7 +10,7 @@
 #include "driver.h"
 #include "deprecat.h"
 #include "streams.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "segag80r.h"
 #include "machine/8255ppi.h"
 #include "sound/samples.h"
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index 33da9d29edd..e42e59625c5 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -13,7 +13,7 @@
 #include "streams.h"
 #include "deprecat.h"
 #include "segag80v.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/sp0250.h"
 #include "segasnd.h"
 
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index a7a1e45ba31..abeeb1f7d54 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -5,7 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 #include "sound/samples.h"
 #include "includes/spacefb.h"
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index ffa8786dab1..2ec4b7c11fc 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -72,7 +72,7 @@ Dip locations and factory settings verified with China Gate US manual.
 #include "driver.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/2151intf.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index 0955a3d6398..af5c2cf7603 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -28,7 +28,7 @@
 ***********************************************************************************/
 #include "driver.h"
 #include "sound/ay8910.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 
 static tilemap *bg_tilemap;
 
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 7306c6edbb4..1068dfb108e 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -10,7 +10,7 @@ driver by Nicola Salmoria
 #include "deprecat.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/sn76496.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index a92dd339761..3f956b3234d 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -57,7 +57,7 @@ and 1 SFX channel controlled by an 8039:
 
 #include "driver.h"
 #include "machine/konami1.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/ay8910.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 1a9758505fb..d429cda0443 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -81,7 +81,7 @@ Blitter source graphics
 #include "tutankhm.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index e5ebd21a8b8..91ecb5d5a98 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -116,7 +116,7 @@ Dip locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 6ca53ba0293..8a5df8644f4 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -9,7 +9,7 @@ To enter service mode, keep 1&2 pressed on reset
 #include "driver.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 0736f85ff5c..c308105066e 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -16,7 +16,7 @@ TODO:
 #include "driver.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index c127f5ab2de..eb9811b19df 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -84,7 +84,7 @@ DM81LS95 = TriState buffer
 **************************************************************************/
 
 #include "driver.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/5220intf.h"
 
 extern UINT8 *portrait_bgvideoram,*portrait_fgvideoram;
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 0e5e8d1ad5d..e39c3c8ed47 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -60,7 +60,7 @@ Sound Board 1b11107
 #include "driver.h"
 #include "cvs.h"
 #include "cpu/s2650/s2650.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 #include "video/s2636.h"
 
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 99e4eab23af..d6acba7ac80 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -39,7 +39,7 @@ PROMs : NEC B406 (1kx4) x2
 
 #include "driver.h"
 #include "deprecat.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "video/resnet.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index a6bc9084668..5ed65ddbd53 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -147,7 +147,7 @@ Tetris         -         -         -         -         EPR12169  EPR12170  -
 #include "system16.h"
 #include "machine/8255ppi.h"
 #include "machine/fd1089.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 #include "sound/2151intf.h"
 
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 02dbcc073b8..44be6150436 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -106,7 +106,7 @@
 
 #include "driver.h"
 #include "spacefb.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 
 
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 835890cae24..0323b1f7dce 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -33,7 +33,7 @@ a000-a3ff   R/W X/Y scroll position of each character (can be scrolled up
 
 #include "driver.h"
 #include "cpu/i8085/i8085.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/sn76496.h"
 
 
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index cbd205a5f06..bd2cb69b852 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -161,7 +161,7 @@ DIP locations verified from manual for:
 
 #include "driver.h"
 #include "cpu/z80/z80.h"
-#include "cpu/i8039/i8039.h"
+#include "cpu/mcs48/mcs48.h"
 #include "system16.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/fd1094.h"