diff --git a/debugger/frames/debugger_class_options.pas b/debugger/frames/debugger_class_options.pas
index a5c757577d..194e59f122 100644
--- a/debugger/frames/debugger_class_options.pas
+++ b/debugger/frames/debugger_class_options.pas
@@ -37,7 +37,7 @@ uses
   GDBMIDebugger,
   // IDE
   TransferMacros, LazarusIDEStrConsts, PathEditorDlg, IDEProcs, DialogProcs,
-  InputHistory, EnvironmentOpts, BaseDebugManager, Debugger;
+  InputHistory, EnvironmentOpts, BaseDebugManager, Debugger, IdeDebuggerOpts;
 
 type
 
diff --git a/debugger/frames/debugger_eventlog_options.pas b/debugger/frames/debugger_eventlog_options.pas
index 39787ef880..5a8a0c0503 100644
--- a/debugger/frames/debugger_eventlog_options.pas
+++ b/debugger/frames/debugger_eventlog_options.pas
@@ -33,7 +33,8 @@ uses
   // IdeIntf
   IDEOptionsIntf, IDEOptEditorIntf,
   // IDE
-  Debugger, LazarusIDEStrConsts, EnvironmentOpts, BaseDebugManager;
+  Debugger, IdeDebuggerOpts, LazarusIDEStrConsts, EnvironmentOpts,
+  BaseDebugManager;
 
 type
   { TDebuggerEventLogOptionsFrame }
diff --git a/debugger/frames/debugger_general_options.pas b/debugger/frames/debugger_general_options.pas
index 07a0813bc9..33a1c6ec7e 100644
--- a/debugger/frames/debugger_general_options.pas
+++ b/debugger/frames/debugger_general_options.pas
@@ -34,7 +34,7 @@ uses
   IDEOptionsIntf, IDEOptEditorIntf,
   // IDE
   LazarusIDEStrConsts, PathEditorDlg, IDEProcs,
-  EnvironmentOpts, BaseDebugManager;
+  EnvironmentOpts, BaseDebugManager, IdeDebuggerOpts;
 
 type
 
diff --git a/debugger/frames/debugger_signals_options.pas b/debugger/frames/debugger_signals_options.pas
index c7827bb5c7..700eca0bc8 100644
--- a/debugger/frames/debugger_signals_options.pas
+++ b/debugger/frames/debugger_signals_options.pas
@@ -31,7 +31,7 @@ uses
   // IdeIntf
   IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf,
   // IDE
-  LazarusIDEStrConsts, Debugger, BaseDebugManager;
+  LazarusIDEStrConsts, Debugger, IdeDebuggerOpts, BaseDebugManager;
 type
 
   { TDebuggerSignalsOptions }
diff --git a/ide/basedebugmanager.pas b/ide/basedebugmanager.pas
index 8d2df5ea8e..2c6788a800 100644
--- a/ide/basedebugmanager.pas
+++ b/ide/basedebugmanager.pas
@@ -50,6 +50,7 @@ uses
   // DebuggerIntf
   DbgIntfBaseTypes, DbgIntfDebuggerBase, DbgIntfPseudoTerminal,
   LazDebuggerIntf,
+  IdeDebuggerOpts,
   // IDE
   Debugger, SourceMarks, Project, ProjectDefs, LazarusIDEStrConsts;
 
@@ -108,14 +109,6 @@ type
   TDbgInitFlag = (difInitForAttach);
   TDbgInitFlags = set of TDbgInitFlag;
 
-  { TDebuggerOptions }
-
-  TDebuggerOptions = class(TAbstractIDEEnvironmentOptions)
-  public
-    class function GetGroupCaption:string; override;
-    class function GetInstance: TAbstractIDEOptions; override;
-  end;
-
   TBaseDebugManager = class(TBaseDebugManagerIntf)
   protected
     FDestroying: boolean;
@@ -257,22 +250,9 @@ type
 
 var
   DebugBoss: TBaseDebugManager;
-  DebuggerOptions: TDebuggerOptions = nil;
 
 implementation
 
-{ TDebuggerOptions }
-
-class function TDebuggerOptions.GetGroupCaption: string;
-begin
-  Result := dlgGroupDebugger;
-end;
-
-class function TDebuggerOptions.GetInstance: TAbstractIDEOptions;
-begin
-  Result := DebuggerOptions;
-end;
-
 initialization
   RegisterIDEOptionsGroup(GroupDebugger, TDebuggerOptions);
   DebugBoss := nil;
diff --git a/ide/main.pp b/ide/main.pp
index 503e3bc3e4..cc5424e8e2 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -149,7 +149,7 @@ uses
   JumpHistoryView, DesktopManager, DiskDiffsDialog,
   BuildLazDialog, BuildProfileManager, BuildManager, CheckCompOptsForNewUnitDlg,
   MiscOptions, InputHistory, InputhistoryWithSearchOpt, UnitDependencies,
-  IDEFPCInfo, IDEInfoDlg, IDEInfoNeedBuild, ProcessList, InitialSetupDlgs,
+  IDEFPCInfo, IDEInfoDlg, IDEInfoNeedBuild, ProcessList, IdeDebuggerOpts, InitialSetupDlgs,
   InitialSetupProc, NewDialog, MakeResStrDlg, DialogProcs, FindReplaceDialog,
   FindInFilesDlg, CodeExplorer, BuildFileDlg, ProcedureList, ExtractProcDlg,
   FindRenameIdentifier, AbstractsMethodsDlg, EmptyMethodsDlg, UnusedUnitsDlg,
diff --git a/ide/packages/idedebugger/idedebugger.lpk b/ide/packages/idedebugger/idedebugger.lpk
index 1a8cc33817..a19e6f4726 100644
--- a/ide/packages/idedebugger/idedebugger.lpk
+++ b/ide/packages/idedebugger/idedebugger.lpk
@@ -69,6 +69,10 @@
         <Filename Value="idedebuggerstringconstants.pas"/>
         <UnitName Value="IdeDebuggerStringConstants"/>
       </Item>
+      <Item>
+        <Filename Value="idedebuggeropts.pas"/>
+        <UnitName Value="IdeDebuggerOpts"/>
+      </Item>
     </Files>
     <RequiredPkgs>
       <Item>
diff --git a/ide/packages/idedebugger/idedebuggeropts.pas b/ide/packages/idedebugger/idedebuggeropts.pas
new file mode 100644
index 0000000000..07af6dc379
--- /dev/null
+++ b/ide/packages/idedebugger/idedebuggeropts.pas
@@ -0,0 +1,41 @@
+unit IdeDebuggerOpts;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, IDEOptionsIntf, IdeDebuggerStringConstants;
+
+type
+
+  TDebuggerOptions = class(TAbstractIDEEnvironmentOptions)
+    class function GetGroupCaption:string; override;
+    class function GetInstance: TAbstractIDEOptions; override;
+  end;
+
+var
+  DebuggerOptions: TDebuggerOptions = nil;
+
+
+implementation
+
+const
+  DebuggerOptsConfFileName = 'debuggeroptions.xml';
+
+{ TDebuggerOptions }
+
+class function TDebuggerOptions.GetGroupCaption: string;
+begin
+  Result := dlgIdeDbgDebugger;
+end;
+
+class function TDebuggerOptions.GetInstance: TAbstractIDEOptions;
+begin
+  Result := DebuggerOptions;
+end;
+
+
+
+end.
+
diff --git a/ide/packages/idedebugger/idedebuggerpackage.pas b/ide/packages/idedebugger/idedebuggerpackage.pas
index 956330a0ef..178d1264f4 100644
--- a/ide/packages/idedebugger/idedebuggerpackage.pas
+++ b/ide/packages/idedebugger/idedebuggerpackage.pas
@@ -11,7 +11,7 @@ uses
   IdeDebuggerBase, Debugger, ProcessDebugger, ProcessList, DebuggerTreeView, 
   IdeDebuggerUtils, IdeDebuggerWatchResult, IdeDebuggerWatchResPrinter, 
   IdeDebuggerWatchResUtils, ArrayNavigationFrame, IdeDebuggerStringConstants, 
-  LazarusPackageIntf;
+  IdeDebuggerOpts, LazarusPackageIntf;
 
 implementation
 
diff --git a/ide/packages/idedebugger/idedebuggerstringconstants.pas b/ide/packages/idedebugger/idedebuggerstringconstants.pas
index 1cadbcfaa8..d10158f86b 100644
--- a/ide/packages/idedebugger/idedebuggerstringconstants.pas
+++ b/ide/packages/idedebugger/idedebuggerstringconstants.pas
@@ -11,6 +11,7 @@ resourcestring
   dlgInspectIndexOfFirstItemToShow = 'Index of first item to show';
   dlgInspectAmountOfItemsToShow = 'Amount of items to show';
   dlgInspectBoundsDD = 'Bounds: %d .. %d';
+  dlgIdeDbgDebugger = 'Debugger';
 
 implementation