diff --git a/src/windows/installer/Product.wxs b/src/windows/installer/Product.wxs
index c8fd6526..904ef73a 100644
--- a/src/windows/installer/Product.wxs
+++ b/src/windows/installer/Product.wxs
@@ -16,30 +16,33 @@
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate />
 
-    <Feature Id="Core" Title="eSpeak NG" Level="1">
-      <ComponentGroupRef Id="CoreComponents" />
+    <Feature Id="All" Title="eSpeak NG" Level="1">
+      <ComponentGroupRef Id="CoreComponents"/>
     </Feature>
   </Product>
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.PlatformProgramFilesFolder)">
-        <Directory Id="INSTALLDIR" Name="eSpeak NG" />
+        <Directory Id="INSTALLDIR" Name="eSpeak NG">
+          <Component Id="espeak_ng_EXE" Win64="$(var.Win64)" Guid="220D42BC-89CD-4230-A458-CD31285EB152">
+            <File Name="$(var.espeak-ng.TargetFileName)" Source="$(var.espeak-ng.TargetPath)" KeyPath="yes"/>
+          </Component>
+          <Component Id="libespeak_ng_DLL" Win64="$(var.Win64)" Guid="AFDF57DE-D7E9-4781-BA0F-5D92FD56B045">
+            <File Name="$(var.libespeak-ng.TargetFileName)" Source="$(var.libespeak-ng.TargetPath)" KeyPath="yes"/>
+            <RegistryKey Root="HKLM" Key="SOFTWARE\eSpeak NG">
+              <RegistryValue Name="Path" Type="string" Value="[INSTALLDIR]"/>
+            </RegistryKey>
+          </Component>
+        </Directory>
       </Directory>
     </Directory>
   </Fragment>
 
   <Fragment>
     <ComponentGroup Id="CoreComponents" Directory="INSTALLDIR">
-      <Component Win64="$(var.Win64)" Guid="220D42BC-89CD-4230-A458-CD31285EB152">
-        <File Name="$(var.espeak-ng.TargetFileName)" Source="$(var.espeak-ng.TargetPath)" KeyPath="yes"/>
-      </Component>
-      <Component Win64="$(var.Win64)" Guid="AFDF57DE-D7E9-4781-BA0F-5D92FD56B045">
-        <File Name="$(var.libespeak-ng.TargetFileName)" Source="$(var.libespeak-ng.TargetPath)" KeyPath="yes"/>
-        <RegistryKey Root="HKLM" Key="SOFTWARE\eSpeak NG" Action="createAndRemoveOnUninstall">
-          <RegistryValue Name="Path" Type="string" Value="[INSTALLDIR]"/>
-        </RegistryKey>
-      </Component>
+      <ComponentRef Id="espeak_ng_EXE"/>
+      <ComponentRef Id="libespeak_ng_DLL"/>
     </ComponentGroup>
   </Fragment>
 </Wix>
\ No newline at end of file