diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a1f97c..48f19661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,12 @@
 ## Enhancements
 
 - Search and Replace: after a failed search give the editor the focus back.
-- It's possible to open ".mak" or "makefile" files as projects. The project inspector will display the rules as configurations and display the content of "src", "include", "import" as source files.
+- It's possible to open ".mak" or "makefile" files as projects. The project inspector will display the rules as configurations and the content of "src/", "include/", "import/" as source files.
 
 ## Bugs fixed
 
 - Crash to desktop for certain invalid or incomplete D constructs. (#107)
+- Project configuration index not handled with option "reloadLastDocuments".
 
 ## Other
 
diff --git a/src/u_main.lfm b/src/u_main.lfm
index 1464d94c..3772ed59 100644
--- a/src/u_main.lfm
+++ b/src/u_main.lfm
@@ -12,6 +12,7 @@ object MainForm: TMainForm
   OnDropFiles = FormDropFiles
   OnResize = FormResize
   ShowHint = True
+  LCLVersion = '2.2.0.4'
   object mainMenu: TMainMenu
     Top = 1
     object MenuItem1: TMenuItem
diff --git a/src/u_main.pas b/src/u_main.pas
index 9e98bc5d..8e0ef773 100644
--- a/src/u_main.pas
+++ b/src/u_main.pas
@@ -591,6 +591,7 @@ type
     fDocIndex: integer;
     fProjectGroup: string;
     fProjectIndex: integer;
+    fProjectConfigIndex: integer;
     procedure setDocuments(value: TStringList);
   protected
     procedure beforeSave; override;
@@ -601,6 +602,7 @@ type
     property project: string read fProjName write fProjName;
     property projectGroup: string read fProjectGroup write fProjectGroup;
     property projectIndex: integer read fProjectIndex write fProjectIndex;
+    property projectConfigIndex: integer read fProjectConfigIndex write fProjectConfigIndex;
   public
     constructor create(aOwner: TComponent); override;
     destructor destroy; override;
@@ -1066,7 +1068,10 @@ begin
     pix := grp.reloadedProjectIndex;
     prj := MainForm.fFreeProj;
     if prj.isAssigned then
+    begin
       fProjName := prj.filename;
+      fProjectConfigIndex := prj.getActiveConfigurationIndex;
+    end;
     fProjectGroup := getProjectGroup.groupFilename;
     if prj = MainForm.fProj then
       fProjectIndex := -1
@@ -1118,6 +1123,8 @@ begin
       grp.setProjectIndex(fProjectIndex);
       grp.getProject(grp.getProjectIndex).activate;
     end;
+    if assigned(dst.fProj) then
+      dst.fProj.setActiveConfigurationIndex(fProjectConfigIndex);
   end
   else inherited;
 end;