diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index 8f4146d2d1..f9a7d410be 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -2094,7 +2094,7 @@ begin
     Compute;
     FFPCVerChangeStamp:=CompilerParseStamp;
     {$IFDEF VerboseFPCSrcScan}
-    debugln(['TBuildManager.MacroFuncFPCVer FPCVer=',FFPCVer,' FPC_FULLVERSION=',FFPC_FULLVERSION]);
+    debugln(['TBuildManager.MacroFuncFPCVer FPCVer=',FFPCVer,' FPC_FULLVERSION=',FFPC_FULLVERSION,' Stamp=',FFPCVerChangeStamp]);
     {$ENDIF}
   end;
   Result:=FFPCVer;
diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas
index 42d4039c8d..451bd43428 100644
--- a/ide/initialsetupdlgs.pas
+++ b/ide/initialsetupdlgs.pas
@@ -45,7 +45,7 @@ uses
   LazLogger, Graphics, ComCtrls, ExtCtrls, StdCtrls, DefineTemplates,
   CodeToolManager, FileProcs, TransferMacros, MacroDefIntf, GDBMIDebugger,
   DbgIntfDebuggerBase, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEProcs,
-  AboutFrm, IDETranslations, InitialSetupProc;
+  AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc;
   
 type
   TInitialSetupDialog = class;
@@ -964,6 +964,7 @@ var
   Quality: TSDFilenameQuality;
   s: String;
   ImageIndex: Integer;
+  CfgCache: TFPCTargetConfigCache;
 begin
   if csDestroying in ComponentState then exit;
   CurCaption:=CompilerComboBox.Text;
@@ -971,6 +972,13 @@ begin
   if fLastParsedCompiler=EnvironmentOptions.GetParsedCompilerFilename then exit;
   fLastParsedCompiler:=EnvironmentOptions.GetParsedCompilerFilename;
   //debugln(['TInitialSetupDialog.UpdateCompilerNote ',fLastParsedCompiler]);
+
+  // check compiler again
+  CfgCache:=CodeToolBoss.FPCDefinesCache.ConfigCaches.Find(
+                                             fLastParsedCompiler,'','','',true);
+  CfgCache.Update(CodeToolBoss.FPCDefinesCache.TestFilename);
+  BuildBoss.SetBuildTargetIDE;
+
   Quality:=CheckCompilerQuality(fLastParsedCompiler,Note,
                                 CodeToolBoss.FPCDefinesCache.TestFilename);
   if Quality<>sddqInvalid then begin