diff --git a/cpmtools/Makefile b/cpmtools/Makefile
index 7a774d9a..8cd6d4f0 100644
--- a/cpmtools/Makefile
+++ b/cpmtools/Makefile
@@ -1,5 +1,5 @@
 # CP/M tools
-TOOLS = r.com w.com bye.com reset.com sw8080.com swz80.com memmap.com \
+TOOLS = r.com w.com bye.com reset.com sw8080.com swz80.com cpu.com memmap.com \
 	survey.com
 
 # CPU tests by various authors, modified for using the CPU switch feature
@@ -29,6 +29,9 @@ sw8080.com: sw8080.asm $(Z80ASM)
 swz80.com: swz80.asm $(Z80ASM)
 	$(Z80ASM) $(Z80ASMFLAGS) -8 -fb -o$@ $<
 
+cpu.com: cpu.asm $(Z80ASM)
+	$(Z80ASM) $(Z80ASMFLAGS) -8 -fb -o$@ $<
+
 survey.com: survey.mac $(Z80ASM)
 	$(Z80ASM) $(Z80ASMFLAGS) -fb -e20 -o$@ $<
 
diff --git a/cpmtools/README b/cpmtools/README
index eeb7bada..632060e4 100644
--- a/cpmtools/README
+++ b/cpmtools/README
@@ -6,6 +6,7 @@ bye.asm       Shutdown z80pack systems via hardware control port
 reset.asm     Reset z80pack systems via hardware control port
 sw8080.asm    Switch to 8080 mode
 swz80.asm     Switch to Z80 mode
+cpu.asm       Reports the CPU
 
 survey.mac    shows system survey with memory map, ports used and so on
 memmap.asm    shows memory map
diff --git a/cpmtools/cpu.asm b/cpmtools/cpu.asm
new file mode 100644
index 00000000..66c76b26
--- /dev/null
+++ b/cpmtools/cpu.asm
@@ -0,0 +1,16 @@
+	ORG	0100H
+
+	MVI	A,88
+	SUB	A
+	JPE	IS8080
+	LXI	D,Z80TXT
+	JMP	PRINT
+IS8080:	LXI	D,I80TXT
+PRINT:	MVI	C,9
+	CALL	5
+	RET
+
+Z80TXT:	DB	'This is a Zilog Z80 CPU$'
+I80TXT:	DB	'This is a Intel 8080 CPU$'
+
+	END
diff --git a/picosim/disks/cpm22.dsk b/picosim/disks/cpm22.dsk
index f0e762db..b5432577 100644
Binary files a/picosim/disks/cpm22.dsk and b/picosim/disks/cpm22.dsk differ
diff --git a/picosim/disks/cpm3-2.dsk b/picosim/disks/cpm3-2.dsk
index 9859f596..1cf7645e 100644
Binary files a/picosim/disks/cpm3-2.dsk and b/picosim/disks/cpm3-2.dsk differ