diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index ab543fe2b4..b8ce4aaaa8 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -4361,6 +4361,7 @@ x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possible values
 4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)
 a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)
 A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)
+x*2WP<x>_Esp8266-rtos-sdk or esp-idf version number: 3.3, 3.4 (esp8266) or 4.2, 4.3 (esp32)
 3*2WR_Generate relocation code (Windows)
 4*2WR_Generate relocation code (Windows)
 A*2WR_Generate relocation code (Windows)
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 9c812f41a1..3e4494ed7f 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -1147,7 +1147,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 88971;
+  MsgTxtSize = 89063;
 
   MsgIdxMax : array[1..20] of longint=(
     28,109,361,131,99,63,148,37,223,69,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 75a0f59622..b5e9e0da16 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1,8 +1,8 @@
 const msgtxt_codepage=20127;
 {$ifdef Delphi}
-const msgtxt : array[0..000370] of string[240]=(
+const msgtxt : array[0..000371] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000370,1..240] of char=(
+const msgtxt : array[0..000371,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -2002,58 +2002,58 @@ const msgtxt : array[0..000370,1..240] of char=(
   '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
   'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
-  '3*2WR_Generate relo','cation code (Windows)'#010+
+  'x*2WP<x>_Esp8266-rt','os-sdk or esp-idf version number: 3.3, 3.4 (esp82'+
+  '66) or 4.2, 4.3 (esp32)'#010+
+  '3*2WR_Generate relocation code (Windows)'#010+
   '4*2WR_Generate relocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
   '8*2Wt<x>_Set the target executable format'#010+
-  '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
-  '8*3Wtexe_Create a DOS .EXE file (','default)'#010+
+  '8*','3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
+  '8*3Wtexe_Create a DOS .EXE file (default)'#010+
   'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
   '6*2WQ<x>_Set executable metadata format (Sinclair QL)'#010+
-  '6*3WQqhdr_Set metadata to QDOS File Header style (default)'#010+
+  '6*3WQqhdr_Set metadata to QD','OS File Header style (default)'#010+
   '6*3WQxtcc_Set metadata to XTcc style'#010+
-  '**2WX_Enable executable ','stack (Linux)'#010+
+  '**2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
   '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+
   '9.1 (Linux)'#010+
-  '**2Xa_Generate code which allows to use more than 2 GB static data on '+
-  '64 Bit targets (Linux)'#010+
-  '**2Xc_Pass --shared/-dynam','ic to the linker (BeOS, Darwin, FreeBSD, L'+
-  'inux)'#010+
+  '**2Xa_Generate code which a','llows to use more than 2 GB static data o'+
+  'n 64 Bit targets (Linux)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
+  'ux)'#010+
   '**2Xd_Do not search default library path (sometimes required for cross'+
-  '-compiling when not using -XR)'#010+
+  '-compiling when not using -XR)',#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xe_Use external link','er'#010+
+  '**2Xe_Use external linker'#010+
   '**2Xf_Substitute pthread library name for linking (BSD)'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
-  '**2Xi_Use internal linker'#010+
+  '**2Xi','_Use internal linker'#010+
   'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in case clang is called clang-'+
-  '7',')'#010+
+  '7)'#010+
   '**2XLA_Define library substitutions for linking'#010+
   '**2XLD_Exclude default order of standard libraries'#010+
   '**2XLO_Define order of library linking'#010+
-  '**2Xm_Generate link map'#010+
+  '**2Xm_Ge','nerate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  '**2X','n_Use target system native linker instead of GNU ld (Solaris, AI'+
-  'X)'#010+
-  'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
-  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (neede','d for cross co'+
-  'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
-  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
-  ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_Try to link units stati','cally (default, defines FPC_LINK_STATIC'+
-  ')'#010+
-  '**2Xt_Link with static libraries (-static is passed to linker)'#010+
-  '**2Xu_Generate executable in UF2 format  (embedded targets only)'#010+
-  '**2Xv_Generate table for Virtual Entry calls'#010+
-  '**2XV_Use VLink as externa','l linker       (default on Amiga, MorphOS)'+
+  '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+
   #010+
+  'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
+  '**2XP<x>_Prepe','nd the binutils names with the prefix <x>'#010+
+  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
+  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
+  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
+  ', L','inux, Mac OS, Solaris)'#010+
+  '**2Xs_Strip all symbols from executable'#010+
+  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
+  '**2Xt_Link with static libraries (-static is passed to linker)'#010+
+  '**2Xu_Generate executable in UF2 format  (em','bedded targets only)'#010+
+  '**2Xv_Generate table for Virtual Entry calls'#010+
+  '**2XV_Use VLink as external linker       (default on Amiga, MorphOS)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
-  '**1h_Shows this help without waiting'
+  '**1h_Shows th','is help without waiting'
 );