diff --git a/compiler/entfile.pas b/compiler/entfile.pas
index b95f91fee4..5f583fe33a 100644
--- a/compiler/entfile.pas
+++ b/compiler/entfile.pas
@@ -156,7 +156,7 @@ const
     { 14 } 32 {'jvm'},
     { 15 } 16 {'i8086'},
     { 16 } 64 {'aarch64'},
-    { 17 } 32 {'wasm'},
+    { 17 } 32 {'wasm32'},
     { 18 } 64 {'sparc64'},
     { 19 } 32 {'riscv32'},
     { 20 } 64 {'riscv64'},
@@ -182,7 +182,7 @@ const
     { 14 } 64 {'jvm'},
     { 15 } 16 {'i8086'},
     { 16 } 64 {'aarch64'},
-    { 17 } 64 {'wasm'},
+    { 17 } 64 {'wasm32'},
     { 18 } 64 {'sparc64'},
     { 19 } 32 {'riscv32'},
     { 20 } 64 {'riscv64'},
diff --git a/compiler/systems.inc b/compiler/systems.inc
index d521a5ad1d..7ebde09094 100644
--- a/compiler/systems.inc
+++ b/compiler/systems.inc
@@ -51,7 +51,7 @@
              cpu_jvm,                      { 14 }
              cpu_i8086,                    { 15 }
              cpu_aarch64,                  { 16 }
-             cpu_wasm,                     { 17 }
+             cpu_wasm32,                   { 17 }
              cpu_sparc64,                  { 18 }
              cpu_riscv32,                  { 19 }
              cpu_riscv64,                  { 20 }
diff --git a/compiler/systems.pas b/compiler/systems.pas
index c3ffbc2dda..6a8758dbf8 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -446,7 +446,7 @@ interface
        cpu2str : array[TSystemCpu] of string[10] =
             ('','i386','m68k','alpha','powerpc','sparc','vm','ia64','x86_64',
              'mips','arm', 'powerpc64', 'avr', 'mipsel','jvm', 'i8086',
-             'aarch64', 'wasm', 'sparc64', 'riscv32', 'riscv64', 'xtensa',
+             'aarch64', 'wasm32', 'sparc64', 'riscv32', 'riscv64', 'xtensa',
              'z80');
 
        abiinfo : array[tabi] of tabiinfo = (
diff --git a/compiler/systems/i_wasm.pas b/compiler/systems/i_wasm.pas
index 24fa19b97b..8250c07262 100644
--- a/compiler/systems/i_wasm.pas
+++ b/compiler/systems/i_wasm.pas
@@ -48,7 +48,7 @@ unit i_wasm;
             flags        : [tf_files_case_sensitive,tf_no_generic_stackcheck,
                             { avoid the creation of threadvar tables }
                             tf_section_threadvars];
-            cpu          : cpu_wasm;
+            cpu          : cpu_wasm32;
             unit_env     : '';
             extradefines : '';
             exeext       : '';
diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp
index dfca978a6f..2261fd3d6e 100644
--- a/compiler/utils/ppuutils/ppudump.pp
+++ b/compiler/utils/ppuutils/ppudump.pp
@@ -82,7 +82,7 @@ const
     { 14 } 'jvm',
     { 15 } 'i8086',
     { 16 } 'aarch64',
-    { 17 } 'wasm',
+    { 17 } 'wasm32',
     { 18 } 'sparc64',
     { 19 } 'riscv32',
     { 20 } 'riscv64',
@@ -109,7 +109,7 @@ const
     { 14 } false {'jvm'},
     { 15 } false {'i8086'},
     { 16 } false {'aarch64'},
-    { 17 } false {'wasm'},
+    { 17 } false {'wasm32'},
     { 18 } false {'sparc64'},
     { 19 } false {'riscv32'},
     { 20 } false {'riscv64'},