diff --git a/ide/helpmanager.pas b/ide/helpmanager.pas
index be5ffd06de..529a3b80f0 100644
--- a/ide/helpmanager.pas
+++ b/ide/helpmanager.pas
@@ -738,6 +738,9 @@ procedure TIDEHelpManager.RegisterIDEHelpDatabases;
     DirItem:=THelpDBISourceDirectory.Create(FPDocNode,
                    '$(FPCSrcDir)/packages/fcl-base/src','*.pp;*.pas',false);
     HTMLHelp.RegisterItem(DirItem);
+    FPDocNode:=THelpNode.CreateURL(HTMLHelp,
+                   'FCL - Free Pascal Component Library Units',
+                   'file://index.html');
     DirItem:=THelpDBISourceDirectory.Create(FPDocNode,
                    '$(FPCSrcDir)/packages/fcl-base/src/inc','*.pp;*.pas',false);
     HTMLHelp.RegisterItem(DirItem);
@@ -820,9 +823,7 @@ begin
   FreeThenNil(FHTMLProviders);
   FreeThenNil(CodeHelpBoss);
   FPCMessagesHelpDB:=nil;
-  FreeThenNil(HelpDatabases);
-  FreeThenNil(HelpViewers);
-  HelpIntfs.HelpManager:=nil;
+  FreeLCLHelpSystem;
   FreeThenNil(HelpOpts);
   FreeThenNil(FMainHelpDBPath);
   FreeThenNil(FRTLHelpDBPath);