diff --git a/ide/fpmopts.inc b/ide/fpmopts.inc
index ec9bd119ae..5fb1b4d9c6 100644
--- a/ide/fpmopts.inc
+++ b/ide/fpmopts.inc
@@ -66,6 +66,7 @@ var R,R2,R3,TabR,TabIR: TRect;
     RB1,{RB2,}RB3,RB4,RB5,RB6: PRadioButtons;
     Items: PSItem;
     IL: PEditorInputLine;
+    IL2: PEditorInputLine;
     Count : integer;
     I,L: longint;
     Tab: PTab;
@@ -74,7 +75,7 @@ var R,R2,R3,TabR,TabIR: TRect;
     Label31,Label41,
     Label51,Label52,Label53: PLabel;
 begin
-  R.Assign(0,0,72,18);
+  R.Assign(0,0,72,21);
   New(D, Init(R, dialog_compilerswitches));
   with D^ do
   begin
@@ -83,6 +84,7 @@ begin
     R.Grow(-2,-1);
     Dec(R.B.Y,2);
     TabR.Copy(R);
+    Dec(TabR.B.Y,2);
     TabIR.Copy(R);
     Inc(TabIR.A.Y,2);
     TabIR.Grow(0,-1);
@@ -284,13 +286,23 @@ begin
 
     { conditionnals }
     R2.Copy(TabR); R2.A.Y:=R2.B.Y+1; R2.B.Y:=R2.A.Y+1; Dec(R2.B.X,4);
-    New(IL, Init(R2, 128));
+    New(IL, Init(R2, 255));
     IL^.Data^:=ConditionalSwitches^.GetStringItem(0);
     Insert(IL);
     R3.Copy(R2); R3.A.X:=R2.B.X+1; R3.B.X:=R3.A.X+3;
     Insert(New(PHistory, Init(R3, IL, hidConditionalDefines)));
     R2.Move(0,-1);
     Insert(New(PLabel, Init(R2,ConditionalSwitches^.ItemName(0), IL)));
+
+    {custom }
+    inc(R2.A.Y,3); inc(R2.B.Y,3);
+    New(IL2, Init(R2, 255));
+    IL2^.Data^:=CustomArg[SwitchesMode];
+    Insert(IL2);
+    R3.Copy(R2); R3.A.X:=R2.B.X+1; R3.B.X:=R3.A.X+3;
+    Insert(New(PHistory, Init(R3, IL2, hidCompilerArgs)));
+    R2.Move(0,-1);
+    Insert(New(PLabel, Init(R2,label_debugger_compilerargs, IL2)));
   end;
   InsertButtons(D);
   if Desktop^.ExecView(D)=cmOK then
@@ -311,6 +323,7 @@ begin
     AsmOutputSwitches^.SetCurrSel(RB6^.Value);
     BrowserSwitches^.SetCurrSel(RB4^.Value);
     ConditionalSwitches^.SetStringItem(0,IL^.Data^);
+    CustomArg[SwitchesMode]:=IL2^.Data^;
   end;
   Dispose(D, Done);
 end;
@@ -446,7 +459,6 @@ var R,R2,R3: TRect;
 {$ifdef Unix}
     IL: PEditorInputLine;
 {$endif Unix}
-    IL2: PEditorInputLine;
     L,I: longint;
     Items: PSItem;
 const
@@ -461,7 +473,7 @@ const
 {$endif win32}
 begin
   R.Assign(0,0,60,2+DebugInfoSwitches^.ItemCount+1+2
-      +ProfileInfoSwitches^.ItemCount+2+2+1+OtherFieldLines);
+      +ProfileInfoSwitches^.ItemCount+2+OtherFieldLines);
   New(D, Init(R, dialog_debugger));
   with D^ do
   begin
@@ -498,18 +510,8 @@ begin
     R2.Move(0,-1); R2.B.Y:=R2.A.Y+1;
     Insert(New(PLabel, Init(R2, label_debugger_profileswitches, RB2)));
 
-    {custom }
-    Inc(R2.A.Y,2+ProfileInfoSwitches^.ItemCount+1); R2.B.Y:=R2.A.Y+1;
-    R3.Copy(R2); Dec(R3.B.X,4);
-    New(IL2, Init(R3, 255));
-    IL2^.Data^:=CustomArg[SwitchesMode];
-    Insert(IL2);
-    R3.Copy(R2); R3.A.X:=R3.B.X-3; R3.B.X:=R3.A.X+3;
-    Insert(New(PHistory, Init(R3, IL2, hidCompilerArgs)));
-    R2.Move(0,-1);
-    Insert(New(PLabel, Init(R2,label_debugger_compilerargs, IL2)));
 {$ifdef win32}
-    R2.Move(0,4);
+    R2.Move(0,ProfileInfoSwitches^.ItemCount+3);
     New(CB2,Init(R2,NewSItem(label_debugger_useanotherconsole, nil)));
     Insert(CB2);
     if DebuggeeTTY<>'' then
@@ -521,7 +523,7 @@ begin
     Insert(New(PLabel, Init(R2,label_debugger_redirection, CB2)));
 {$endif win32}
 {$ifdef Unix}
-    R2.Move(0,4);
+    R2.Move(0,ProfileInfoSwitches^.ItemCount+3);
     New(IL, Init(R2, 255));
     IL^.Data^:=DebuggeeTTY;
     Insert(IL);
@@ -536,7 +538,6 @@ begin
     DebugInfoSwitches^.SetCurrSel(RB^.Value);
     ProfileInfoSwitches^.SetCurrSel(RB2^.Value);
     OtherLinkerSwitches^.SetBooleanItem(0,CBStrip^.Mark(0));
-    CustomArg[SwitchesMode]:=IL2^.Data^;
 {$ifdef win32}
     if CB2^.value<>0 then
       DebuggeeTTY:='on'
diff --git a/ide/fpstre.inc b/ide/fpstre.inc
index 3e0aa89e99..949a68f657 100644
--- a/ide/fpstre.inc
+++ b/ide/fpstre.inc
@@ -502,7 +502,7 @@ const
       dialog_debugger = 'Browsing/Debugging/Profiling';
       label_debugger_debuginfo = 'Debugging information';
       label_debugger_profileswitches = 'Profiling Switches';
-      label_debugger_compilerargs = '~A~dditional compiler args';
+      label_debugger_compilerargs = 'Additional ~c~ompiler args';
       label_debugger_useanotherconsole = '~U~se another console';
       label_debugger_redirection = 'Debuggee ~R~edirection';
       label_debugger_useanothertty = '~U~se Another tty for Debuggee';
@@ -796,7 +796,8 @@ const
       opt_level2optimizations = 'Level ~2~ optimizations';
       opt_i386486 = 'i~3~86/i486';
       opt_pentiumandmmx = 'Pentium/PentiumMM~X~ (tm)';
-      opt_pentiumpro = 'P~P~ro/PII/c6x86/K6 (tm)';
+      opt_pentiumpro = '~P~entium2/PentiumM/AMD';
+      opt_pentiumiv = 'Pentium~4~';
       opt_m68000 = 'm~6~8000';
       opt_m68020 = 'm680~2~0';
       { Assembler options }
diff --git a/ide/fpswitch.pas b/ide/fpswitch.pas
index 23e853ad29..251b4f0eeb 100644
--- a/ide/fpswitch.pas
+++ b/ide/fpswitch.pas
@@ -917,6 +917,7 @@ begin
      AddSelectItem(opt_i386486,'p1',idNone);
      AddSelectItem(opt_pentiumandmmx,'p2',idNone);
      AddSelectItem(opt_pentiumpro,'p3',idNone);
+     AddSelectItem(opt_pentiumiv,'p4',idNone);
 {$else not I386}
  {$ifdef m68k}
      AddSelectItem(opt_m68000,'',idNone);