diff --git a/.gitattributes b/.gitattributes
index 80c1e2e0d0..d2a8d6c0cd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2031,6 +2031,7 @@ doceditor/images/treenode_add24.bmp -text
 doceditor/images/underline_blue24.bmp -text
 doceditor/lazde.lpi svneol=native#text/plain
 doceditor/lazde.lpr svneol=native#text/pascal
+doceditor/lazde.rc svneol=native#text/plain
 doceditor/lazdemsg.pp svneol=native#text/pascal
 doceditor/lazdeopts.pp svneol=native#text/pascal
 doceditor/pgeditor.pp svneol=native#text/pascal
diff --git a/doceditor/lazde.lpi b/doceditor/lazde.lpi
index 7050c9b0bf..d5f0e37da6 100644
--- a/doceditor/lazde.lpi
+++ b/doceditor/lazde.lpi
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
+      <Flags>
+        <LRSInOutputDirectory Value="False"/>
+      </Flags>
       <SessionStorage Value="InIDEConfig"/>
       <MainUnit Value="0"/>
       <TargetFileExt Value=""/>
@@ -40,10 +42,9 @@
       </Unit1>
       <Unit2>
         <Filename Value="fmmakeskel.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="MakeSkelForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="fmmakeskel.lrs"/>
         <UnitName Value="fmMakeskel"/>
       </Unit2>
       <Unit3>
@@ -53,81 +54,71 @@
       </Unit3>
       <Unit4>
         <Filename Value="frmabout.pp"/>
-        <HasResources Value="True"/>
         <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmabout.lrs"/>
+        <HasResources Value="True"/>
         <UnitName Value="frmabout"/>
       </Unit4>
       <Unit5>
         <Filename Value="frmbuild.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="BuildForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmbuild.lrs"/>
         <UnitName Value="frmBuild"/>
       </Unit5>
       <Unit6>
         <Filename Value="frmexample.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="ExampleForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmexample.lrs"/>
         <UnitName Value="FrmExample"/>
       </Unit6>
       <Unit7>
         <Filename Value="frmlink.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="LinkForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmlink.lrs"/>
         <UnitName Value="FrmLink"/>
       </Unit7>
       <Unit8>
         <Filename Value="frmmain.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="MainForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmmain.lrs"/>
         <UnitName Value="FrmMain"/>
       </Unit8>
       <Unit9>
         <Filename Value="frmmakeskel.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="MakeSkelForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmmakeskel.lrs"/>
         <UnitName Value="FrmMakeSkel"/>
       </Unit9>
       <Unit10>
         <Filename Value="frmnewnode.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="NewNodeForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmnewnode.lrs"/>
         <UnitName Value="frmNewNode"/>
       </Unit10>
       <Unit11>
         <Filename Value="frmoptions.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="OptionsForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmoptions.lrs"/>
         <UnitName Value="frmOptions"/>
       </Unit11>
       <Unit12>
         <Filename Value="frmsource.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="SourceForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmsource.lrs"/>
         <UnitName Value="frmSource"/>
       </Unit12>
       <Unit13>
         <Filename Value="frmtable.pp"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="TableForm"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
-        <ResourceFilename Value="frmtable.lrs"/>
         <UnitName Value="frmTable"/>
       </Unit13>
       <Unit14>
diff --git a/doceditor/lazde.lpr b/doceditor/lazde.lpr
index f10f99302b..3950c509bb 100644
--- a/doceditor/lazde.lpr
+++ b/doceditor/lazde.lpr
@@ -8,7 +8,7 @@ uses
   frmLink, frmTable, frmabout, pkeditor, eleditor, fpdeutil, frmexample,
   frmbuild, fmmakeskel, frmsource, lazdemsg, lazdeopts, pgeditor;
 
-{$IFDEF WINDOWS}{$R manifest.rc}{$ENDIF}
+{$IFDEF WINDOWS}{$R lazde.rc}{$ENDIF}
 
 begin
   Application.Initialize;
diff --git a/doceditor/lazde.rc b/doceditor/lazde.rc
new file mode 100644
index 0000000000..54b7b3224f
--- /dev/null
+++ b/doceditor/lazde.rc
@@ -0,0 +1,6 @@
+#define RT_MANIFEST  24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
+#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "lazde.manifest"