diff --git a/compiler/systems.pas b/compiler/systems.pas
index 705f601dac..b29cdfaeb2 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -735,10 +735,10 @@ begin
   when the define is the same as the source cpu then we use the source
   os, else we pick a default }
 {$ifdef i386}
-  {$ifdef cpu86}
+  {$ifdef cpui386}
     default_target(source_info.system);
     {$define default_target_set}
-  {$else cpu86}
+  {$else cpui386}
    {$ifdef linux}
     default_target(system_i386_linux);
     {$define default_target_set}
@@ -759,7 +759,7 @@ begin
     {$define default_target_set}
     default_target(system_i386_android);
    {$endif}
-  {$endif cpu86}
+  {$endif cpui386}
   { default is linux }
   {$ifndef default_target_set}
    default_target(system_i386_linux);
diff --git a/compiler/systems/i_android.pas b/compiler/systems/i_android.pas
index 91ce8a0524..dcf9f72398 100644
--- a/compiler/systems/i_android.pas
+++ b/compiler/systems/i_android.pas
@@ -162,11 +162,11 @@ unit i_android;
 implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef android}
     set_source_info(system_i386_android_info);
   {$endif}
-{$endif CPU86}
+{$endif CPUI386}
 {$ifdef CPUARM}
   {$ifdef android}
     set_source_info(system_arm_android_info);
diff --git a/compiler/systems/i_beos.pas b/compiler/systems/i_beos.pas
index b2a7f22fdb..bfdf975f70 100644
--- a/compiler/systems/i_beos.pas
+++ b/compiler/systems/i_beos.pas
@@ -105,11 +105,11 @@ unit i_beos;
   implementation
 
 initialization
-{$ifdef cpu86}
+{$ifdef cpui386}
   {$ifdef beos}
     {$ifndef haiku}
       set_source_info(system_i386_beos_info);
     {$endif haiku}
   {$endif beos}
-{$endif cpu86}
+{$endif cpui386}
 end.
diff --git a/compiler/systems/i_bsd.pas b/compiler/systems/i_bsd.pas
index 3b47cd2edf..649f5c2842 100644
--- a/compiler/systems/i_bsd.pas
+++ b/compiler/systems/i_bsd.pas
@@ -951,7 +951,7 @@ unit i_bsd;
   implementation
 
 initialization
-{$ifdef cpu86}
+{$ifdef cpui386}
   {$ifdef FreeBSD}
      set_source_info(system_i386_FreeBSD_info);
   {$endif}
@@ -964,7 +964,7 @@ initialization
   {$ifdef Darwin}
      set_source_info(system_i386_Darwin_info);
   {$endif Darwin}
-{$endif cpu86}
+{$endif cpui386}
 {$ifdef cpux86_64}
    {$ifdef FreeBSD}
      set_source_info(system_x86_64_FreeBSD_info);
diff --git a/compiler/systems/i_emx.pas b/compiler/systems/i_emx.pas
index 18c24c5ee2..cce75e5280 100644
--- a/compiler/systems/i_emx.pas
+++ b/compiler/systems/i_emx.pas
@@ -106,7 +106,7 @@ unit i_emx;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef EMX}
     {$IFNDEF VER1_0}
       set_source_info(system_i386_emx_info);
@@ -115,5 +115,5 @@ initialization
         source_info.scriptext := '.bat';
     {$ENDIF VER1_0}
   {$endif EMX}
-{$endif CPU86}
+{$endif CPUI386}
 end.
diff --git a/compiler/systems/i_go32v2.pas b/compiler/systems/i_go32v2.pas
index 9ccd984a36..b5d20b3239 100644
--- a/compiler/systems/i_go32v2.pas
+++ b/compiler/systems/i_go32v2.pas
@@ -94,9 +94,9 @@ unit i_go32v2;
   implementation
 
 initialization
-{$ifdef cpu86}
+{$ifdef cpui386}
   {$ifdef go32v2}
     set_source_info(system_i386_go32v2_info);
   {$endif go32v2}
-{$endif cpu86}
+{$endif cpui386}
 end.
diff --git a/compiler/systems/i_haiku.pas b/compiler/systems/i_haiku.pas
index 15b391d486..71b6fef5e5 100644
--- a/compiler/systems/i_haiku.pas
+++ b/compiler/systems/i_haiku.pas
@@ -106,9 +106,9 @@ unit i_haiku;
   implementation
 
 initialization
-{$ifdef cpu86}
+{$ifdef cpui386}
   {$ifdef haiku}
     set_source_info(system_i386_haiku_info);
   {$endif haiku}
-{$endif cpu86}
+{$endif cpui386}
 end.
diff --git a/compiler/systems/i_linux.pas b/compiler/systems/i_linux.pas
index f35d32a7b2..3eded0f6a2 100644
--- a/compiler/systems/i_linux.pas
+++ b/compiler/systems/i_linux.pas
@@ -940,14 +940,14 @@ unit i_linux;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef linux}
     { some FreeBSD versions define linux as well }
     {$ifndef FreeBSD}
       set_source_info(system_i386_linux_info);
     {$endif FreeBSD}
   {$endif}
-{$endif CPU86}
+{$endif CPUI386}
 {$ifdef CPU68}
   {$ifdef linux}
     set_source_info(system_m68k_linux_info);
diff --git a/compiler/systems/i_nativent.pas b/compiler/systems/i_nativent.pas
index b283e73f86..9828a56611 100644
--- a/compiler/systems/i_nativent.pas
+++ b/compiler/systems/i_nativent.pas
@@ -99,9 +99,9 @@ unit i_nativent;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef NATIVENT}
     set_source_info(system_i386_nativent_info);
   {$endif NATIVENT}
-{$endif CPU86}
+{$endif CPUI386}
 end.
diff --git a/compiler/systems/i_nwl.pas b/compiler/systems/i_nwl.pas
index 17d28947dd..5264094cbe 100644
--- a/compiler/systems/i_nwl.pas
+++ b/compiler/systems/i_nwl.pas
@@ -94,9 +94,9 @@ unit i_nwl;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef netwlibc}
     set_source_info(system_i386_netwlibc_info);
   {$endif netwlibc}
-{$endif CPU86}
+{$endif CPUI386}
 end.
diff --git a/compiler/systems/i_nwm.pas b/compiler/systems/i_nwm.pas
index 82ed77d5de..13506cae41 100644
--- a/compiler/systems/i_nwm.pas
+++ b/compiler/systems/i_nwm.pas
@@ -94,9 +94,9 @@ unit i_nwm;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef netware}
     set_source_info(system_i386_netware_info);
   {$endif netware}
-{$endif CPU86}
+{$endif CPUI386}
 end.
diff --git a/compiler/systems/i_os2.pas b/compiler/systems/i_os2.pas
index 135c004b7a..21e854cdca 100644
--- a/compiler/systems/i_os2.pas
+++ b/compiler/systems/i_os2.pas
@@ -106,7 +106,7 @@ unit i_os2;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef os2}
     {$IFNDEF EMX}
       set_source_info(system_i386_os2_info);
@@ -115,5 +115,5 @@ initialization
       set_source_info(system_i386_os2_info);
     {$ENDIF VER1_0}
   {$endif os2}
-{$endif CPU86}
+{$endif CPUI386}
 end.
diff --git a/compiler/systems/i_sunos.pas b/compiler/systems/i_sunos.pas
index b142b48381..558dfe3344 100644
--- a/compiler/systems/i_sunos.pas
+++ b/compiler/systems/i_sunos.pas
@@ -230,11 +230,11 @@ unit i_sunos;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef solaris}
     set_source_info(system_i386_solaris_info);
   {$endif solaris}
-{$endif CPU86}
+{$endif CPUI386}
 {$ifdef CPUX86_64}
   {$ifdef solaris}
     set_source_info(system_x86_64_solaris_info);
diff --git a/compiler/systems/i_symbian.pas b/compiler/systems/i_symbian.pas
index 4f5a1caa36..bccb22ca04 100644
--- a/compiler/systems/i_symbian.pas
+++ b/compiler/systems/i_symbian.pas
@@ -161,11 +161,11 @@ implementation
 
 initialization
 
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef Symbian}
   set_source_info(system_i386_symbian_info);
   {$endif Symbian}
-{$endif CPU86}
+{$endif CPUI386}
 
 {$ifdef CPUARM}
   {$ifdef Symbian}
diff --git a/compiler/systems/i_watcom.pas b/compiler/systems/i_watcom.pas
index b27f23110f..9cf1aef621 100644
--- a/compiler/systems/i_watcom.pas
+++ b/compiler/systems/i_watcom.pas
@@ -94,9 +94,9 @@ unit i_watcom;
   implementation
 
 initialization
-{$ifdef cpu86}
+{$ifdef cpui386}
   {$ifdef watcom}
     set_source_info(system_i386_watcom_info);
   {$endif watcom}
-{$endif cpu86}
+{$endif cpui386}
 end.
diff --git a/compiler/systems/i_wdosx.pas b/compiler/systems/i_wdosx.pas
index 0bff33417b..509c913c0e 100644
--- a/compiler/systems/i_wdosx.pas
+++ b/compiler/systems/i_wdosx.pas
@@ -94,11 +94,11 @@ unit i_wdosx;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef WIN32}
     {$ifdef WDOSX}
       set_source_info(system_i386_wdosx_info);
     {$endif WDOSX}
   {$endif WIN32}
-{$endif CPU86}
+{$endif CPUI386}
 end.
diff --git a/compiler/systems/i_win.pas b/compiler/systems/i_win.pas
index 6a3d8e4045..c995f07f3e 100644
--- a/compiler/systems/i_win.pas
+++ b/compiler/systems/i_win.pas
@@ -297,7 +297,7 @@ unit i_win;
   implementation
 
 initialization
-{$ifdef CPU86}
+{$ifdef CPUI386}
   {$ifdef WIN32}
     {$ifndef WDOSX}
       set_source_info(system_i386_win32_info);
@@ -306,7 +306,7 @@ initialization
   {$ifdef WINCE}
     set_source_info(system_i386_wince_info);
   {$endif WINCE}
-{$endif CPU86}
+{$endif CPUI386}
 
 {$ifdef CPUX86_64}
   {$ifdef WIN64}
diff --git a/compiler/version.pas b/compiler/version.pas
index 2d8198405a..f51fcde36a 100644
--- a/compiler/version.pas
+++ b/compiler/version.pas
@@ -41,9 +41,9 @@ interface
        date_string = {$I %DATE%};
 
        { source cpu string }
-{$ifdef cpu86}
+{$ifdef cpui386}
         source_cpu_string = 'i386';
-{$endif cpu86}
+{$endif cpui386}
 {$ifdef cpupowerpc32}
         source_cpu_string = 'powerpc';
 {$endif cpupowerpc32}