diff --git a/wix/main.wxs b/wix/main.wxs
index b671012c..71d530ac 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -68,20 +68,34 @@
                             </Shortcut>
                         </File>
                     </Component>
-                    <Component Id='RegistryComponent' Guid='*'>
-                        <RegistryKey Root='HKCR' Key='irc' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
-                            <RegistryValue Type='string' Value='URL:IRC Protocol' />
-                            <RegistryValue Type='string' Name='URL Protocol' Value='' />
-                            
+                    <Component Id='RegistryComponentDefaultPrograms' Guid='*'>
+                        <RegistryKey Root='HKLM' Key='Software\Classes\irc' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
+                            <!-- Default Icon -->
                             <RegistryKey Key='DefaultIcon' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
-                                <RegistryValue Type="string" Value='"[APPLICATIONFOLDER]Halloy.exe",0' />
+                                <RegistryValue Type='string' Value='"[APPLICATIONFOLDER]Halloy.exe",0' />
                             </RegistryKey>
 
+                            <!-- Open Command -->
                             <RegistryKey Key='shell\open\command' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
-                                <RegistryValue Type='expandable' Value='"[APPLICATIONFOLDER]Halloy.exe" "%1"'/>
+                                <RegistryValue Type='string' Value='"[APPLICATIONFOLDER]Halloy.exe" "%1"'/>
                             </RegistryKey>
                         </RegistryKey>
+
+                        <!-- Register with Default Programs -->
+                        <RegistryKey Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\App Paths\Halloy.exe' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
+                            <RegistryValue Type='string' Value='"[APPLICATIONFOLDER]Halloy.exe"' />
+                        </RegistryKey>
+
+                        <RegistryKey Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\Halloy' ForceCreateOnInstall='yes' ForceDeleteOnUninstall='yes'>
+                            <RegistryValue Type='string' Name='DisplayName' Value='Halloy' />
+                            <RegistryValue Type='string' Name='UninstallString' Value='"[APPLICATIONFOLDER]Halloy.exe" /uninstall' />
+                        </RegistryKey>
                     </Component>
+
+                    <!-- Feature definition -->
+                    <Feature Id='DefaultProgramFeature' Title='Default Programs' Level='1'>
+                        <ComponentRef Id='RegistryComponentDefaultPrograms' />
+                    </Feature>
                 </Directory>
             </Directory>