Index: .gitignore
===================================================================
diff -u -r46767c1e354dbe9e6ac671c57864c36b9bdc6967 -r06947d0418541679c15d8adcfeafbe3f485647f9
--- .gitignore	(.../.gitignore)	(revision 46767c1e354dbe9e6ac671c57864c36b9bdc6967)
+++ .gitignore	(.../.gitignore)	(revision 06947d0418541679c15d8adcfeafbe3f485647f9)
@@ -23,7 +23,6 @@
 Application/Riskeer/src/Application.Riskeer.Setup/RiskeerExecutableConfigPayload.wxs
 Application/Riskeer/src/Application.Riskeer.Setup/MigrationExecutablePayload.wxs
 Application/Riskeer/src/Application.Riskeer.Setup/MigrationExecutableConfigPayload.wxs
-Application/Riskeer/src/Application.Riskeer.Setup/ThirdPartyLicensesPayload.wxs
 *.ldb
 
 # ReSharper is a .NET coding add-in
Index: Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj
===================================================================
diff -u -r55ede1864533e22243f169dae32e938a2d91feb2 -r06947d0418541679c15d8adcfeafbe3f485647f9
--- Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision 55ede1864533e22243f169dae32e938a2d91feb2)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision 06947d0418541679c15d8adcfeafbe3f485647f9)
@@ -58,7 +58,6 @@
     <Compile Include="Installer UI\wixUI_Deltares.wxs" />
     <Compile Include="Product.wxs" />
     <Compile Include="RiskeerPayload.wxs" />
-    <Compile Include="ThirdPartyLicensesPayload.wxs" />
     <Compile Include="RiskeerExecutablePayload.wxs" />
     <Compile Include="RiskeerExecutableConfigPayload.wxs" />
     <Compile Include="MigrationExecutablePayload.wxs" />
@@ -303,7 +302,6 @@
     <Folder Include="Examples\Voorbeeld Traject 6-3 - Hydraulische belastingen voor bekledingen\" />
     <Folder Include="InstallationVerification\" />
     <Folder Include="Installer UI" />
-    <Folder Include="licenses\" />
     <Folder Include="IHW" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
@@ -313,7 +311,6 @@
       ReleaseVersion=$(ReleaseVersion);
       ApplicationBinFolder=..\..\..\..\bin\$(Configuration);
       ApplicationNestedBinFolder=..\..\..\..\bin\$(Configuration)\Application;
-      InstallerLicensesFolder=Licenses\;
       ExamplesFolder=Examples\;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
@@ -322,7 +319,6 @@
       "$(WIX)bin\heat.exe" file $(ProjectDir)..\..\..\..\bin\$(Configuration)\Migratiehulpprogramma.exe -cg MigrationExecutable -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)MigrationExecutablePayload.wxs"
       "$(WIX)bin\heat.exe" file $(ProjectDir)..\..\..\..\bin\$(Configuration)\Migratiehulpprogramma.exe.config -cg MigrationExecutableConfig -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)MigrationExecutableConfigPayload.wxs"
       "$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\..\bin\$(Configuration)\Application -cg RiskeerApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationNestedBinFolder -sfrag -sreg -o "$(ProjectDir)RiskeerPayload.wxs"
-      "$(WIX)bin\heat.exe" dir $(ProjectDir)Licenses -cg ThirdPartyLicenseComponents -gg -dr INSTALLDIR -var var.InstallerLicensesFolder -sfrag -sreg -o "$(ProjectDir)ThirdPartyLicensesPayload.wxs"
       "$(WIX)bin\heat.exe" dir $(ProjectDir)Examples -cg Examples -gg -dr CommonDocumentsExamples -var var.ExamplesFolder -sfrag -sreg -srd -o "$(ProjectDir)Examples.wxs"</PreBuildEvent>
   </PropertyGroup>
   <!--
Fisheye: Tag 06947d0418541679c15d8adcfeafbe3f485647f9 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer.Setup/Licenses/Licentie.rtf'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0be6d7b97571d852b903312f7dd99604b8171dd5 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer.Setup/Licentie.rtf'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Riskeer/src/Application.Riskeer.Setup/Localization_nl-NL.wxl
===================================================================
diff -u -r044e408f6997e77fd6f941e4b14490e1f4464ed2 -r06947d0418541679c15d8adcfeafbe3f485647f9
--- Application/Riskeer/src/Application.Riskeer.Setup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision 044e408f6997e77fd6f941e4b14490e1f4464ed2)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision 06947d0418541679c15d8adcfeafbe3f485647f9)
@@ -11,6 +11,8 @@
   <String Id="UserManualName">Gebruikershandleiding Riskeer 23.1.1</String>
   <String Id="UserManualDescription">Open de gebruikershandleiding van Riskeer.</String>
 
+  <String Id="LicenseName">Licentie.rtf</String>
+
   <String Id="Examples">Voorbeelden</String>
   <String Id="InstallationVerification">Installatie verificatie</String>
   <String Id="CalculationConfigurationXSD">Berekeningen importeren of exporteren - xsd</String>
Index: Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs
===================================================================
diff -u -r55ede1864533e22243f169dae32e938a2d91feb2 -r06947d0418541679c15d8adcfeafbe3f485647f9
--- Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 55ede1864533e22243f169dae32e938a2d91feb2)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 06947d0418541679c15d8adcfeafbe3f485647f9)
@@ -41,8 +41,7 @@
               RiskeerExecutableConfigPayload.wxs defines the executable config going into this folder.
               MigrationExecutablePayload.wxs defines the 'Migratiehulpprogramma' executable going into this folder.
               MigrationExecutableConfigPayload.wxs defines the 'Migratiehulpprogramma' executable config going into this folder.
-              RiskeerPayload.wxs defines the Application folder (which contains all files) going into this folder. 
-              ThirdPartyLicensesPayload.wxs defines all license files for all used 3rd party libraries.
+              RiskeerPayload.wxs defines the Application folder (which contains all files) going into this folder.
               
               All the stated .wxs files will be generated on pre-build. Ensure you have build the solution before building the installer!
               -->
@@ -67,6 +66,10 @@
               <File Id="RiskeerUserManual" Name="!(loc.UserManualName).pdf" Source="!(loc.UserManualName).pdf" KeyPath="yes"/>
             </Component>
 
+            <Component Id="License" Guid="67026D06-0AC2-4DC2-B0F0-18C0048A3290">
+              <File Id="RiskeerLicense" Name="!(loc.LicenseName)" Source="!(loc.LicenseName)" KeyPath="yes"/>
+            </Component>
+
           </Directory>
         </Directory>
       </Directory>
@@ -159,13 +162,13 @@
       <ComponentGroupRef Id="MigrationExecutable"/>
       <ComponentGroupRef Id="MigrationExecutableConfig"/>
       <ComponentGroupRef Id="RiskeerApplicationComponents"/>
-      <ComponentGroupRef Id="ThirdPartyLicenseComponents"/>
       <ComponentGroupRef Id="Examples"/>
       <ComponentGroupRef Id="InstallationVerificationFiles"/>
       <ComponentGroupRef Id="CalculationConfigurationFiles"/>
       <ComponentRef Id="ProgramMenuShortcut"/>
       <ComponentRef Id="DesktopShortcut"/>
       <ComponentRef Id="UserManual"/>
+      <ComponentRef Id="License"/>
       <ComponentRef Id="ProgramMenuManualShortcut"/>
       <ComponentRef Id="IHWFile"/>
       <ComponentRef Id="FileAssociation"/>