diff --git a/resources/install/windows/SCRegistrySpec.wxi b/resources/install/windows/SCRegistrySpec.wxi
index 9bc0aefd0..204ef73f3 100644
--- a/resources/install/windows/SCRegistrySpec.wxi
+++ b/resources/install/windows/SCRegistrySpec.wxi
@@ -7,6 +7,7 @@
       Id="Component_SipRegistryEntries"
       Directory="TARGETDIR"
       Guid="CF88EDC2-7D07-4269-946C-B8FF917887ED">
+    <Condition><![CDATA[CREATE_SIP_REGISTRY_ENTRIES]]></Condition>
     <RegistryKey Action="createAndRemoveOnUninstall" Key="sip" Root="HKCR">
       <RegistryValue Type="string" Value="URL: SIP Protocol handler" />
       <RegistryValue Name="URL Protocol" Type="string" Value="" />
@@ -23,6 +24,7 @@
       Id="Component_FeedRegistryEntries"
       Directory="TARGETDIR"
       Guid="BDB06CF9-F840-4CD6-B8B1-C24AC9CD11AB">
+    <Condition><![CDATA[CREATE_FEED_REGISTRY_ENTRIES]]></Condition>
     <RegistryKey Action="createAndRemoveOnUninstall" Key="feed" Root="HKCR">
       <RegistryValue Type="string" Value="URL: RSS Protocol handler" />
       <RegistryValue Name="URL Protocol" Type="string" Value="" />
diff --git a/resources/install/windows/en-us.wxl b/resources/install/windows/en-us.wxl
index da0f0d4a4..1c179ea88 100644
--- a/resources/install/windows/en-us.wxl
+++ b/resources/install/windows/en-us.wxl
@@ -2,6 +2,11 @@
 <WixLocalization
     xmlns="http://schemas.microsoft.com/wix/2006/localization"
     Culture="en-us">
+  <String Id="ShortcutsAndRegistryDlg_Title" Overridable="yes">[ProductName] Setup</String>
+  <String Id="ShortcutsAndRegistryDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutsAndRegistryDlgDescription" Overridable="yes">Which additional tasks should be done?</String>
+  <String Id="ShortcutsAndRegistryDlgTitle" Overridable="yes">{\WixUI_Font_Title}Additional Tasks</String>
+
   <String Id="WelcomeText1" Overridable="yes"><![CDATA[@WelcomeText1@]]></String>
   <String Id="WelcomeText2" Overridable="yes"><![CDATA[@WelcomeText2@]]></String>
   <String Id="WelcomeText3" Overridable="yes">{\GreyText}@WelcomeText3@</String>
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index 9da01ff5f..4daff7db2 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -39,6 +39,7 @@
 
   <Directory Id="DesktopFolder" Name="Desktop">
     <Component Id="Component_DesktopShortcut" Guid="49BF78B5-155F-43F2-BCEC-3CABC0D9531E">
+      <Condition><![CDATA[CREATE_DESKTOP_SHORTCUT]]></Condition>
       <Shortcut
           Id="Shortcut_Desktop"
           Icon="Icon.ico"
@@ -56,6 +57,7 @@
   </Directory>
   <Directory Id="ProgramMenuFolder" Name="Programs">
     <Component Id="Component_StartMenuShortcut" Guid="6B8CDA4E-16C9-4AF4-B338-CBA4775ADD0D">
+      <Condition><![CDATA[CREATE_START_MENU_SHORTCUT]]></Condition>
       <Shortcut
           Id="Shortcut_StartMenu"
           Icon="Icon.ico"
@@ -125,6 +127,28 @@
                 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
             </Dialog>
 
+            <Dialog Id="ShortcutsAndRegistryDlg" Width="370" Height="270" Title="!(loc.ShortcutsAndRegistryDlg_Title)">
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+
+                <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ShortcutsAndRegistryDlgDescription)" />
+                <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ShortcutsAndRegistryDlgTitle)" />
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.ShortcutsAndRegistryDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+
+                <Control Id="ShortcutGroup" Type="GroupBox" X="20" Y="60" Width="330" Height="50" Text="&amp;Create Shortcuts" />
+                <Control Id="StartMenuShortcutCheckBox" Type="CheckBox" X="25" Y="75" Width="320" Height="15" Property="CREATE_START_MENU_SHORTCUT" CheckBoxValue="1" Text="S&amp;tart Menu" />
+                <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="90" Width="320" Height="15" Property="CREATE_DESKTOP_SHORTCUT" CheckBoxValue="1" Text="&amp;Desktop" />
+
+                <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="115" Width="330" Height="50" Text="&amp;Associate Protocols" />
+                <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="130" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;SIP" />
+                <Control Id="FeedRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="145" Width="320" Height="15" Property="CREATE_FEED_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;FEED" />
+            </Dialog>
+
   <Publish 
       Control="Finish"
       Dialog="CExitDialog"
@@ -189,6 +213,10 @@
 <Property Id="ARPCONTACT" Value="@APP_EMAIL@" />
 <Property Id="ARPHELPLINK" Value="@APP_WEB@" />
 <Property Id="ARPPRODUCTICON" Value="Icon.ico" />
+<Property Id="CREATE_DESKTOP_SHORTCUT" Value="1" />
+<Property Id="CREATE_FEED_REGISTRY_ENTRIES" Value="1" />
+<Property Id="CREATE_SIP_REGISTRY_ENTRIES" Value="1" />
+<Property Id="CREATE_START_MENU_SHORTCUT" Value="1" />
 <Property Id="WixShellExecTarget" Value="[#run.exe]" />
 <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
 <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch @APP_NAME@" />
@@ -239,11 +267,14 @@
             <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
             <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">1</Publish>
             <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID="1"]]></Publish>
+            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ShortcutsAndRegistryDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID="1"]]></Publish>
             <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
             <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-            
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
+
+            <Publish Dialog="ShortcutsAndRegistryDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+            <Publish Dialog="ShortcutsAndRegistryDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ShortcutsAndRegistryDlg" Order="1">NOT Installed</Publish>
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish>
 
             <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>