diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index 0b9f9bf8..fff78941 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -272,10 +272,10 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path)
 	}
 
 	buf[0] = 0;
-	RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\Tokens\\eSpeak", 0, KEY_READ, &RegKey);
+	RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\eSpeak NG", 0, KEY_READ, &RegKey);
 	size = sizeof(buf);
 	var_type = REG_SZ;
-	RegQueryValueExA(RegKey, "path", 0, &var_type, buf, &size);
+	RegQueryValueExA(RegKey, "Path", 0, &var_type, buf, &size);
 
 	sprintf(path_home, "%s\\espeak-data", buf);
 #elif defined(PLATFORM_DOS)
diff --git a/src/windows/installer/Product.wxs b/src/windows/installer/Product.wxs
index 0d51130f..602d221e 100644
--- a/src/windows/installer/Product.wxs
+++ b/src/windows/installer/Product.wxs
@@ -28,18 +28,21 @@
 	<Fragment>
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="$(var.PlatformProgramFilesFolder)">
-				<Directory Id="INSTALLFOLDER" Name="eSpeak NG" />
+				<Directory Id="INSTALLDIR" Name="eSpeak NG" />
 			</Directory>
 		</Directory>
 	</Fragment>
 
 	<Fragment>
-		<ComponentGroup Id="CoreComponents" Directory="INSTALLFOLDER">
+		<ComponentGroup Id="CoreComponents" Directory="INSTALLDIR">
       <Component Id="espeak_ng" Win64="$(var.Win64)">
         <File Id="espeak_ng_exe" Name="$(var.espeak-ng.TargetFileName)" Source="$(var.espeak-ng.TargetPath)" KeyPath="yes"/>
       </Component>
       <Component Id="libespeak_ng" Win64="$(var.Win64)">
         <File Id="libespeak_ng_dll" Name="$(var.libespeak-ng.TargetFileName)" Source="$(var.libespeak-ng.TargetPath)" KeyPath="yes"/>
+        <RegistryKey Id="espeakngReg" Root="HKLM" Key="SOFTWARE\eSpeak NG" Action="createAndRemoveOnUninstall">
+          <RegistryValue Name="Path" Type="string" Value="[INSTALLDIR]"/>
+        </RegistryKey>
       </Component>
     </ComponentGroup>
 	</Fragment>