diff --git a/compiler/entfile.pas b/compiler/entfile.pas
index 7fae4f7a2f..b95f91fee4 100644
--- a/compiler/entfile.pas
+++ b/compiler/entfile.pas
@@ -160,7 +160,8 @@ const
     { 18 } 64 {'sparc64'},
     { 19 } 32 {'riscv32'},
     { 20 } 64 {'riscv64'},
-    { 21 } 32 {'xtensa'}
+    { 21 } 32 {'xtensa'},
+    { 22 } 16 {'z80'}
     );
   CpuAluBitSize : array[tsystemcpu] of longint =
     (
@@ -185,7 +186,8 @@ const
     { 18 } 64 {'sparc64'},
     { 19 } 32 {'riscv32'},
     { 20 } 64 {'riscv64'},
-    { 21 } 32 {'xtensa'}
+    { 21 } 32 {'xtensa'},
+    { 22 }  8 {'z80'}
     );
 {$endif generic_cpu}
 
diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp
index d5e9b5dc22..fc96ddf686 100644
--- a/compiler/utils/ppuutils/ppudump.pp
+++ b/compiler/utils/ppuutils/ppudump.pp
@@ -86,7 +86,8 @@ const
     { 18 } 'sparc64',
     { 19 } 'riscv32',
     { 20 } 'riscv64',
-    { 21 } 'xtensa'
+    { 21 } 'xtensa',
+    { 22 } 'z80'
     );
 
   CpuHasController : array[tsystemcpu] of boolean =
@@ -112,7 +113,8 @@ const
     { 18 } false {'sparc64'},
     { 19 } false {'riscv32'},
     { 20 } false {'riscv64'},
-    { 21 } true  {'xtensa'}
+    { 21 } true  {'xtensa'},
+    { 22 } true  {'z80'}
     );
 
 { List of all supported system-cpu couples }