diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index a6b69eb..7a6aa6f 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -48,6 +48,10 @@
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="Aerofoil"/>
       </Directory>
+
+
+      <!-- Desktop -->
+      <Directory Id="DesktopFolder" Name="Desktop" />
     </Directory>
 
     <DirectoryRef Id="AEROFOILPRODUCTDIR">
@@ -128,8 +132,20 @@
                   Description="Aerofoil Documentation"
                   Target="[#readme.txt]"
                   WorkingDirectory="AEROFOILDOCUMENTATIONDIR"/>
-        <RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
-        <RegistryValue Root="HKCU" Key="Software\AerofoilProject\Aerofoil" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+        <RemoveFolder Id="CleanUpShortCutStartMenu" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\AerofoilProject\Aerofoil" Name="installed_startmenu" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="DesktopShortcuts" Guid="*">
+        <Shortcut Id="ApplicationDesktopShortcut"
+          Name="Aerofoil"
+          Description="Aerofoil"
+          Target="[#Aerofoil.exe]"
+          WorkingDirectory="AEROFOILPRODUCTDIR"/>
+        <RemoveFolder Id="CleanUpShortCutDesktop" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\AerofoilProject\Aerofoil" Name="installed_desktop" Type="integer" Value="1" KeyPath="yes"/>
       </Component>
     </DirectoryRef>
 
@@ -154,6 +170,7 @@
       <ComponentGroupRef Id="LooseDocumentationComponentGroup"/>
 
       <ComponentRef Id="StartMenuShortcuts" />
+      <ComponentRef Id="DesktopShortcuts" />
 
       <Feature Id="HousePack1Feature" Title="Additional Houses" Level="1" Description="!(loc.HousePack1FeatureDescription)">
         <ComponentGroupRef Id="HousePack1ComponentGroup" />
diff --git a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
index f0c04c4..179f372 100644
--- a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
+++ b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
@@ -96,6 +96,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\GpFontHandler_FreeType2\GpFontHandler_FreeType2.vcxproj">
+      <Name>GpFontHandler_FreeType2</Name>
+      <Project>{4b564030-8985-4975-91e1-e1b2c16ae2a1}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\gpr2gpa\gpr2gpa.vcxproj">
       <Name>gpr2gpa</Name>
       <Project>{27b7ca46-ed23-45c2-bf5f-0c126d81aebf}</Project>