diff --git a/build/installer-x86.bat b/build/installer-x86.bat
new file mode 100644
index 00000000..7746e546
--- /dev/null
+++ b/build/installer-x86.bat
@@ -0,0 +1,4 @@
+@echo off
+set PATH=C:\Program Files (x86)\Windows Installer XML v3.5\bin
+candle installer-x86.wxs -ext WixUIExtension -ext WixUtilExtension
+light installer-x86.wixobj -ext WixUIExtension -ext WixUtilExtension
diff --git a/build/installer-x86.wxs b/build/installer-x86.wxs
index 14c36066..eff12694 100644
--- a/build/installer-x86.wxs
+++ b/build/installer-x86.wxs
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    # This comment is generated by WixEdit, the specific commandline
+    # arguments for the WiX Toolset are stored here.
+
+    candleArgs: "<projectfile>" -out "<projectname>.wixobj" -ext WixUIExtension -ext WixUtilExtension
+    lightArgs: "<projectname>.wixobj" -out "<projectname>.msi" -ext WixUIExtension -ext WixUtilExtension
+-->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="6327A50B-891F-4B29-8E13-DAC16751B8FF" Name="XChat-WDK (x86)" Language="1033" Version="14.96.7.0" Manufacturer="WixEdit" UpgradeCode="66437248-5687-4F16-BC05-B3119549BC90">
         <Package Description="XChat-WDK (x86) Installer" Comments="XChat-WDK (x86) Installer" InstallerVersion="200" Compressed="yes" />
@@ -2055,8 +2062,12 @@
                 </Feature>
             </Feature>
             <Feature Id="Perl" Level="2" Title="Perl">
-                <ComponentRef Id="XCPERL_512.DLL" />
-                <ComponentRef Id="XCPERL_514.DLL" />
+                <Feature Id="Perl512" Level="2" Title="Perl 5.12">
+                    <ComponentRef Id="XCPERL_512.DLL" />
+                </Feature>
+                <Feature Id="Perl514" Level="2" Title="Perl 5.14">
+                    <ComponentRef Id="XCPERL_514.DLL" />
+                </Feature>
             </Feature>
             <Feature Id="Python" Level="2" Title="Python">
                 <ComponentRef Id="XCPYTHON.DLL" />
@@ -2070,9 +2081,14 @@
         <WixVariable Id="WixUIBannerBmp" Value="bitmaps\wizardsmallimage.bmp" />
         <Property Id="ApplicationFolderName" Value="XChat-WDK" />
         <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Run XChat-WDK after closing the Wizard" />
+        <Property Id="WixShellExecTarget" Value="[#XCHAT.EXE]" />
+        <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
         <UI>
+            <UIRef Id="WixUI_Advanced" />
+            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">
+                WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed
+            </Publish>
         </UI>
-        <UIRef Id="WixUI_Advanced" />
-        <Icon Id="StartMenuIcon.exe" SourceFile="..\dist-x86\xchat.exe" />
     </Product>
 </Wix>
\ No newline at end of file