diff --git a/ide/customdefines.pas b/ide/customdefines.pas
index 698ce3bef6..7e886961cb 100644
--- a/ide/customdefines.pas
+++ b/ide/customdefines.pas
@@ -54,6 +54,7 @@ type
     FOptionsReader: TCompilerOptReader;
     FOptionsThread: TCompilerOptThread;
     FCustomOptions: TStrings;
+    FUseComments: Boolean;
     procedure SetIdleConnected(AValue: Boolean);
     procedure OnIdle(Sender: TObject; var Done: Boolean);
     procedure DeleteSelected;
@@ -66,6 +67,7 @@ type
     property OptionsReader: TCompilerOptReader read FOptionsReader write FOptionsReader;
     property OptionsThread: TCompilerOptThread read FOptionsThread write FOptionsThread;
     property CustomOptions: TStrings read FCustomOptions write FCustomOptions;
+    property UseComments: Boolean read FUseComments write FUseComments;
   end;
 
 
@@ -209,7 +211,7 @@ begin
     if DefinesCheckList.Checked[i] then
       FOptionsReader.Defines.Add('-d' + DefinesCheckList.Items[i]);
   // Then add all options and defines.
-  FOptionsReader.ToCustomOptions(aStrings, False);
+  FOptionsReader.ToCustomOptions(aStrings, FUseComments);
   Result:=mrOk;
 end;
 
diff --git a/ide/frames/compiler_other_options.pas b/ide/frames/compiler_other_options.pas
index 232e99e2ff..2413acbb0a 100644
--- a/ide/frames/compiler_other_options.pas
+++ b/ide/frames/compiler_other_options.pas
@@ -31,9 +31,9 @@ uses
   Classes, SysUtils, math, AVL_Tree, LazLogger, Forms, Controls, Graphics,
   Dialogs, StdCtrls, LCLProc, ComCtrls, LCLType, ExtCtrls, Buttons,
   CodeToolsCfgScript, KeywordFuncLists, LazarusIDEStrConsts,
-  IDEOptionsIntf, CompOptsIntf, IDECommands, Project,
-  CompilerOptions, AllCompilerOptions, Compiler, EditorOptions, PackageDefs,
-  SynEdit, SynEditKeyCmds, SynCompletion, SourceSynEditor, CustomDefines;
+  IDEOptionsIntf, CompOptsIntf, IDECommands, Project, PackageDefs,
+  CompilerOptions, Compiler, AllCompilerOptions, CustomDefines,
+  EditorOptions, SynEdit, SynEditKeyCmds, SynCompletion, SourceSynEditor;
 
 type
 
@@ -150,6 +150,7 @@ begin
     EditForm.OptionsThread := FOptionsThread;
     EditForm.CustomOptions := memoCustomOptions.Lines;
     EditForm.DefinesCheckList.Items.Assign(Project1.CustomDefines);
+    EditForm.UseComments := FUseComments;
     if EditForm.ShowModal = mrOK then
     begin
       Project1.CustomDefines.Assign(EditForm.DefinesCheckList.Items);