diff --git a/utils/fpcmkcfg/fpc.cft b/utils/fpcmkcfg/fpc.cft
index 6e92a46019..edd965a143 100644
--- a/utils/fpcmkcfg/fpc.cft
+++ b/utils/fpcmkcfg/fpc.cft
@@ -216,6 +216,13 @@
 # Always strip debuginfo from the executable
 -Xs
 
+# Always use smartlinking on i8086, because the system unit exceeds the 64kb
+# code limit
+#ifdef cpui8086
+-CX
+-XX
+#endif
+
 
 # -------------
 # Miscellaneous
diff --git a/utils/fpcmkcfg/fpccfg.inc b/utils/fpcmkcfg/fpccfg.inc
index 690db01baf..1b906ea6c8 100644
--- a/utils/fpcmkcfg/fpccfg.inc
+++ b/utils/fpcmkcfg/fpccfg.inc
@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const DefaultConfig : array[0..28] of string[240]=(
+const DefaultConfig : array[0..29] of string[240]=(
 {$else Delphi}
-const DefaultConfig : array[0..28,1..240] of char=(
+const DefaultConfig : array[0..29,1..240] of char=(
 {$endif Delphi}
   '#'#013#010+
   '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#013#010+
@@ -239,8 +239,16 @@ const DefaultConfig : array[0..28,1..240] of char=(
   '# Always strip debuginfo from the executable'#013#010+
   '-Xs'#013#010+
   #013#010+
+  '# Always use ','smartlinking on i8086, because the system unit exceeds '+
+  'the 64kb'#013#010+
+  '# code limit'#013#010+
+  '#ifdef cpui8086'#013#010+
+  '-CX'#013#010+
+  '-XX'#013#010+
+  '#endif'#013#010+
   #013#010+
-  '# ---------','----'#013#010+
+  #013#010+
+  '# -------------'#013#010+
   '# Miscellaneous'#013#010+
   '# -------------'#013#010+
   #013#010+
@@ -248,24 +256,23 @@ const DefaultConfig : array[0..28,1..240] of char=(
   '-l'#013#010+
   #013#010+
   '# Verbosity'#013#010+
-  '#      e : Show errors (default)       d : Show debug info'#013#010+
+  '#      e : Show',' errors (default)       d : Show debug info'#013#010+
   '#      w : Show warnings               u : Show unit info'#013#010+
-  '#      n : Show notes    ','              t : Show tried/used files'#013+
-  #010+
+  '#      n : Show notes                  t : Show tried/used files'#013#010+
   '#      h : Show hints                  s : Show time stamps'#013#010+
-  '#      i : Show general info           q : Show message numbers'#013#010+
+  '#      i ',': Show general info           q : Show message numbers'#013#010+
   '#      l : Show linenumbers            c : Show conditionals'#013#010+
-  '#      a : ','Show everything             0 : Show nothing (except erro'+
-  'rs)'#013#010+
-  '#      b : Write file names messages   r : Rhide/GCC compatibility mod'+
-  'e'#013#010+
+  '#      a : Show everything             0 : Show nothing (except errors'+
+  ')'#013#010+
+  '#      b : Write file names messages   r : Rhide/','GCC compatibility m'+
+  'ode'#013#010+
   '#          with full path              x : Executable info (Win32 only'+
   ')'#013#010+
-  '#      v : write fpcdebug.txt wi','th     p : Write tree.log with parse'+
-  ' tree'#013#010+
+  '#      v : write fpcdebug.txt with     p : Write tree.log with parse t'+
+  'ree'#013#010+
   '#          lots of debugging info'#013#010+
   '#'#013#010+
-  '# Display Info, Warnings and Notes'#013#010+
+  '# Display Info, Warnings and N','otes'#013#010+
   '-viwn'#013#010+
   '# If you don'#039't want so much verbosity use'#013#010+
   '#-vw'#013#010