diff --git a/resources/install/windows/SCRegistrySpec.wxi b/resources/install/windows/SCRegistrySpec.wxi
index 204ef73f3..44b2d9164 100644
--- a/resources/install/windows/SCRegistrySpec.wxi
+++ b/resources/install/windows/SCRegistrySpec.wxi
@@ -37,6 +37,23 @@
           Value='"[INSTALLDIR]run.exe" %1' />
     </RegistryKey>
   </Component>
+  <Component
+      Id="Component_XmppRegistryEntries"
+      Directory="TARGETDIR"
+      Guid="3C9C09AE-1F57-11DE-B96D-6B8D56D89593">
+    <Condition><![CDATA[CREATE_XMPP_REGISTRY_ENTRIES]]></Condition>
+    <RegistryKey Action="createAndRemoveOnUninstall" Key="xmpp" Root="HKCR">
+      <RegistryValue Type="string" Value="URL: XMPP Protocol handler" />
+      <RegistryValue Name="URL Protocol" Type="string" Value="" />
+      <RegistryValue
+          Key="DefaultIcon" Type="string" Value="[INSTALLDIR]sc-logo.ico" />
+      <RegistryValue
+          Key="shell\open\command"
+          KeyPath="yes"
+          Type="string"
+          Value='"[INSTALLDIR]run.exe" %1' />
+    </RegistryKey>
+  </Component>
 
 </ComponentGroup>
 </Fragment>
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index d46a26816..30a13ebbd 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -164,9 +164,10 @@
                 <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="90" Width="320" Height="15" Property="CREATE_DESKTOP_SHORTCUT" CheckBoxValue="1" Text="&amp;Desktop" />
                 <Control Id="StartupShortcutCheckBox" Type="CheckBox" X="25" Y="105" Width="320" Height="15" Property="CREATE_STARTUP_SHORTCUT" CheckBoxValue="1" Text="&amp;Auto-start when computer restarts or reboots" />
 
-                <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="130" Width="330" Height="50" Text="&amp;Associate Protocols" />
+                <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="130" Width="330" Height="65" Text="&amp;Associate Protocols" />
                 <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="145" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;SIP" />
                 <Control Id="FeedRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="160" Width="320" Height="15" Property="CREATE_FEED_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;FEED" />
+                <Control Id="XmppRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="175" Width="320" Height="15" Property="CREATE_XMPP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;XMPP" />
             </Dialog>
 
   <Publish 
@@ -235,6 +236,7 @@
 <Property Id="ARPPRODUCTICON" Value="Icon.ico" />
 <Property Id="CREATE_FEED_REGISTRY_ENTRIES" Value="1" />
 <Property Id="CREATE_SIP_REGISTRY_ENTRIES" Value="1" />
+<Property Id="CREATE_XMPP_REGISTRY_ENTRIES" Value="1" />
 <Property Id="WixShellExecTarget" Value="[#run.exe]" />
 <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
 <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch @APP_NAME@" />