diff --git a/.gitattributes b/.gitattributes
index 3dfe9e8d1f..989e469196 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -156,6 +156,7 @@ ide/projectopts.pp svneol=native#text/pascal
 ide/runparamsopts.pas svneol=native#text/pascal
 ide/splash.lrs svneol=native#text/pascal
 ide/splash.pp svneol=native#text/pascal
+ide/sysvaruseroverridedlg.pas svneol=native#text/pascal
 ide/tcolumndlg1.lfm svneol=native#text/plain
 ide/tinsertwatch.lfm svneol=native#text/plain
 ide/transfermacros.pp svneol=native#text/pascal
diff --git a/designer/propedits.pp b/designer/propedits.pp
index aa0b4a7b72..fcc8db0415 100644
--- a/designer/propedits.pp
+++ b/designer/propedits.pp
@@ -2694,9 +2694,7 @@ procedure TListColumnsPropertyEditor.Edit;
 var
 
   ListColumns : TListColumns;
-  Column : TListColumn;
   ColumnDlg: TColumnDlg;
-  I,X        : Integer;
 begin
   ColumnDlg:=TColumnDlg.Create(Application);
   try
diff --git a/ide/sysvaruseroverridedlg.pas b/ide/sysvaruseroverridedlg.pas
new file mode 100644
index 0000000000..e875dd27fe
--- /dev/null
+++ b/ide/sysvaruseroverridedlg.pas
@@ -0,0 +1,149 @@
+{
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+  Author: Mattias Gaertner
+
+  Abstract:
+    Dialog to edit System-Variables-User-Overrides.
+    Used by the run parameter dialog
+}
+unit SysVarUserOverrideDlg;
+
+{$mode objfpc}{$H+}
+
+{$I ide.inc}
+
+interface
+
+uses
+  {$IFDEF IDE_MEM_CHECK}
+  MemCheck,
+  {$ENDIF}
+  Classes, SysUtils, Controls, Forms, Buttons, StdCtrls, ComCtrls, Dialogs,
+  ExtCtrls, LResources, XMLCfg, DOS, IDEProcs;
+
+type
+  TSysVarUserOverrideDialog = class(TForm)
+    VariableLabel: TLabel;
+    VariableEdit: TEdit;
+    ValueLabel: TLabel;
+    ValueEdit: TEdit;
+    OkButton: TButton;
+    CancelButton: TButton;
+    procedure OkButtonClick(Sender: TObject);
+    procedure CancelButtonClick(Sender: TObject);
+  private
+  public
+    constructor Create(TheOwner: TComponent); override;
+  end;
+
+function ShowSysVarUserOverrideDialog(var Variable, Value: string): TModalResult;
+
+
+implementation
+
+
+function ShowSysVarUserOverrideDialog(var Variable, Value: string): TModalResult;
+var SysVarUserOverrideDialog: TSysVarUserOverrideDialog;
+begin
+  SysVarUserOverrideDialog:=TSysVarUserOverrideDialog.Create(Application);
+  with SysVarUserOverrideDialog do begin
+    VariableEdit.Text:=Variable;
+    ValueEdit.Text:=Value;
+    Result:=ShowModal;
+    if (Result=mrOk) then begin
+      Variable:=VariableEdit.Text;
+      Value:=ValueEdit.Text;
+    end;
+    Free;
+  end;
+end;
+
+{ TSysVarUserOverrideDialog }
+
+procedure TSysVarUserOverrideDialog.OkButtonClick(Sender: TObject);
+begin
+  ModalResult:=mrOk;
+end;
+
+procedure TSysVarUserOverrideDialog.CancelButtonClick(Sender: TObject);
+begin
+  ModalResult:=mrCancel;
+end;
+
+constructor TSysVarUserOverrideDialog.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  if LazarusResources.Find(ClassName)=nil then begin
+
+    Caption:='Override system variable';
+    SetBounds((Screen.Width-400) div 2,(Screen.Height-200) div 2,400,200);
+
+    VariableLabel:=TLabel.Create(Self);
+    with VariableLabel do begin
+      Name:='VariableLabel';
+      Parent:=Self;
+      SetBounds(10,10,150,Height);
+      Caption:='Variable:';
+      Visible:=true;
+    end;
+    
+    VariableEdit:=TEdit.Create(Self);
+    with VariableEdit do begin
+      Name:='VariableEdit';
+      Parent:=Self;
+      SetBounds(VariableLabel.Left,VariableLabel.Top+VariableLabel.Height+2,
+        Self.ClientWidth-2*Left,Height);
+      Visible:=true;
+    end;
+
+    ValueLabel:=TLabel.Create(Self);
+    with ValueLabel do begin
+      Name:='ValueLabel';
+      Parent:=Self;
+      SetBounds(VariableEdit.Left,VariableEdit.Top+VariableEdit.Height+10,
+        150,Height);
+      Caption:='Value:';
+      Visible:=true;
+    end;
+
+    ValueEdit:=TEdit.Create(Self);
+    with ValueEdit do begin
+      Name:='ValueEdit';
+      Parent:=Self;
+      SetBounds(ValueLabel.Left,ValueLabel.Top+ValueLabel.Height+2,
+        Self.ClientWidth-2*Left,Height);
+      Visible:=true;
+    end;
+
+    OkButton:=TButton.Create(Self);
+    with OkButton do begin
+      Name:='OkButton';
+      Parent:=Self;
+      SetBounds(Self.ClientWidth-220,Self.ClientHeight-40,100,25);
+      Caption:='Ok';
+      OnClick:=@OkButtonClick;
+      Visible:=true;
+    end;
+
+    CancelButton:=TButton.Create(Self);
+    with CancelButton do begin
+      Name:='CancelButton';
+      Parent:=Self;
+      SetBounds(OkButton.Left+OkButton.Width+10,OkButton.Top,100,25);
+      Caption:='Cancel';
+      OnClick:=@CancelButtonClick;
+      Visible:=true;
+    end;
+  end;
+end;
+
+end.
+
diff --git a/ide/transfermacros.pp b/ide/transfermacros.pp
index 5bb2cf7547..6c50c6757d 100644
--- a/ide/transfermacros.pp
+++ b/ide/transfermacros.pp
@@ -76,7 +76,8 @@ type
   public
     constructor Create;
     destructor Destroy; override;
-    property Items[Index: integer]: TTransferMacro read GetItems write SetItems; default;
+    property Items[Index: integer]: TTransferMacro
+       read GetItems write SetItems; default;
     procedure SetValue(const MacroName, NewValue: string);
     function Count: integer;
     procedure Clear;