diff --git a/docs/html/build_lcl_docs.lpi b/docs/html/build_lcl_docs.lpi
index 4673eb69b4..f301737b0b 100644
--- a/docs/html/build_lcl_docs.lpi
+++ b/docs/html/build_lcl_docs.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -16,19 +16,15 @@
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
+        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
-      <FormatVersion Value="2"/>
-      <Modes Count="1">
-        <Mode0 Name="default">
-          <local>
-            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
-          </local>
-        </Mode0>
-      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
diff --git a/ide/lazarus.res b/ide/lazarus.res
index e07b2e57b0..f938fb51df 100644
Binary files a/ide/lazarus.res and b/ide/lazarus.res differ
diff --git a/ide/project.pp b/ide/project.pp
index 831be6cbaf..2390371711 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -4642,9 +4642,8 @@ var
   PkgDependency: TPkgDependency;
 begin
   PkgDependency:=FindDependencyByNameInList(FirstRequiredDependency,pdlRequires,PackageName);
-  Result := Assigned(PkgDependency);
-  if Result then
-    RemoveRequiredDependency(PkgDependency);
+  if PkgDependency=nil then exit(false);
+  RemoveRequiredDependency(PkgDependency);
 end;
 
 procedure TProject.LockUnitComponentDependencies;