Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Product.wxs
===================================================================
diff -u -rc6aa6d8b043bf96d1311de21ad56a6e886cddcb9 -r8e254606bacf5c5a7e39c83394aed8e88d315eb3
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Product.wxs	(.../Product.wxs)	(revision c6aa6d8b043bf96d1311de21ad56a6e886cddcb9)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Product.wxs	(.../Product.wxs)	(revision 8e254606bacf5c5a7e39c83394aed8e88d315eb3)
@@ -40,7 +40,7 @@
             
               <!--
               RingtoetsPayload.wxs defines all files going into this folder. 
-              ThirdPartyLicensesPayload.wxs defines all license files for all used 3rd party livrs.
+              ThirdPartyLicensesPayload.wxs defines all license files for all used 3rd party libraries.
               
               RingtoetsPayload.wxs and ThirdPartyLicensesPayload.wxs will be generated on pre-build. Ensure you clean first before building the installer!
               -->
@@ -98,16 +98,18 @@
                         Target="[BINDIR]$(var.Application.Ringtoets.TargetFileName)"
                         WorkingDirectory="INSTALLDIR"
                         Icon="Ringtoets.ico"/>
-
+              <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuRingtoets" On="uninstall" />
+              <RemoveFolder Id="RemoveProgramMenuWTI" Directory="ProgramMenuWTI" On="uninstall" />
+              <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="RingtoetsProgMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+            </Component>
+            
+            <Component Id="ProgramMenuManualShortcut" Guid="579211B2-24A0-4B29-929D-147C1DB4FB81">
               <Shortcut Id="UserManualShortcut"
                         Name="!(loc.UserManualName)"
                         Description="!(loc.UserManualDescription)"
                         Target="[INSTALLDIR]Ringtoets_Manual.pdf"
                         Icon="Manual.ico"/>
-              
-              <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuRingtoets" On="uninstall" />
-              <RemoveFolder Id="RemoveProgramMenuWTI" Directory="ProgramMenuWTI" On="uninstall" />
-              <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="RingtoetsProgMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+              <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="RingtoetsProgMenuManualShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
             </Component>
             
           </Directory>
@@ -138,10 +140,10 @@
             <Directory Id="CommonDocumentsNBPW" Name="NBPW">
               
               <Component Id="IHWFile" Guid="911042BC-FE0E-4A5A-819D-B43CCA0B9544">
-                <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.dbf" ></File>
+                <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.dbf"></File>
                 <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.prj"></File>
                 <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.qpj"></File>
-                <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.shp"></File>
+                <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.shp" KeyPath="yes"></File>
                 <File Source="IHW\voorbeeldbestand_nationaalBestandPrimaireWaterkeringen.shx"></File>
                 
                 <RemoveFolder Id="RemoveCommonDocumentsNBPW" Directory="CommonDocumentsNBPW" On="uninstall" />
@@ -164,6 +166,7 @@
       <ComponentRef Id="DesktopShortcut"/>
       <ComponentRef Id="LicenseFile"/>
       <ComponentRef Id="UserManual"/>
+      <ComponentRef Id="ProgramMenuManualShortcut"/>
       <ComponentRef Id="IHWFile"/>
       <ComponentRef Id="FileAssociation"/>
 		</Feature>