diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 4721fcba11..f9c3af20c3 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -3855,6 +3855,7 @@ A*2WI_Turn on/off the usage of import sections (Windows)
 8*3WmMedium_Medium memory model
 8*3WmCompact_Compact memory model
 8*3WmLarge_Large memory model
+8*3WmHuge_Huge memory model
 3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwin)
 4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwin)
 p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwin)
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 7c3a034990..02627be280 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -1017,7 +1017,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 75883;
+  MsgTxtSize = 75911;
 
   MsgIdxMax : array[1..20] of longint=(
     26,99,342,124,96,58,127,32,207,64,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 9b0d30646e..26d7384a9e 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1688,69 +1688,68 @@ const msgtxt : array[0..000316,1..240] of char=(
   '8*3WmM','edium_Medium memory model'#010+
   '8*3WmCompact_Compact memory model'#010+
   '8*3WmLarge_Large memory model'#010+
+  '8*3WmHuge_Huge memory model'#010+
   '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
-  'n)'#010+
-  'p*2W','M<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+  '4*2WM<x>_Minimum Mac OS X deployment version: 10.','4, 10.5.1, ... (Dar'+
   'win)'#010+
+  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  'n)'#010+
   'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  '4*2WN_Do not generate reloca','tion code, needed for debugging (Windows'+
-  ')'#010+
+  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010,
+  '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
   'ble values'#010+
-  'm*2Wpxxxx_Specify the controller type; see fpc ','-i or fpc -iu for pos'+
+  'm*2Wpxxxx_Specify t','he controller type; see fpc -i or fpc -iu for pos'+
   'sible values'#010+
   'V*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
   'ble values'#010+
   '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
-  '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ...',' (iphonesim)'+
+  '4*2WP<x>_Minimum iOS deploym','ent 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 relocation code (Windows)'#010+
-  '4*2WR_Generate relocation code (Windows)'#010+
-  'A*2WR_Generat','e 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*3Wtexe_Create a DOS .EXE file (default)'#010+
   '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
-  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
-  '**2WX_Enab','le executable stack (Linux)'#010+
+  'P*2WT_Specify MPW tool type application',' (Classic Mac OS)'#010+
+  '**2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#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+
-  '**2Xe_Use ex','ternal linker'#010+
+  '-compiling when',' not using -XR)'#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+
-  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_Use internal',' linker'#010+
+  '**2XD_Try to link units dynamically      (defines FPC_LINK','_DYNAMIC)'#010+
+  '**2Xi_Use internal linker'#010+
   '**2XLA_Define library substitutions for linking'#010+
   '**2XLO_Define order of library linking'#010+
   '**2XLD_Exclude default order of standard libraries'#010+
   '**2Xm_Generate link map'#010+
-  '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
-  's '#039'main'#039,')'#010+
+  '**2XM<x>_Set the name of the '#039'main'#039' progra','m routine (default'+
+  ' is '#039'main'#039')'#010+
   '**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>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set the linker'#039's rlink-path to <x> ','(needed for cross co'+
+  '**2Xr<x>_Set the',' linker'#039's rlink-path to <x> (needed 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',' statically (default, defines FPC_LINK_STATIC'+
-  ')'#010+
+  '**2Xs_Strip all symbols from execut','able'#010+
+  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
   '**2Xv_Generate table for Virtual Entry calls'#010+
-  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
+  '**2XX_Try to smartlink units             (defines FPC_LIN','K_SMART)'#010+
   '**1*_'#010+
-  '**1?_Show thi','s help'#010+
+  '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'
 );