diff --git a/Changes b/Changes
index 2674b3bd3..968d49458 100644
--- a/Changes
+++ b/Changes
@@ -82,6 +82,7 @@ packaging:
 * Install basic-authentication-server-plugin.cfg plugin default configuration on debian
 * fix #446: Always add Sys::Hostname dependency to rpm packaging
 * fix #493: Add support for CONFIG=reset option for MSI Installer
+* fix #522: Fix etc, log & var folders are not deleted from installation folder on MSI uninstall
 
 contrib:
 * fix #429: Permit MSI package installation from current folder
diff --git a/contrib/windows/packaging/MSI_main-v2.wxs.tt b/contrib/windows/packaging/MSI_main-v2.wxs.tt
index 9c9bde9db..f057a18c8 100644
--- a/contrib/windows/packaging/MSI_main-v2.wxs.tt
+++ b/contrib/windows/packaging/MSI_main-v2.wxs.tt
@@ -28,7 +28,7 @@
     <Property Id="_EXECMODE_RADIO_BUTTON" Value="1" Secure="yes" />
 
     <Property Id="UPGRADEDIR" Secure="yes">
-      <RegistrySearch Id="InstallDir" Root="HKLM" Key="[%agent_regpath%]\Installer" Name="InstallLocation" Type="raw" />
+      <RegistrySearch Id="InstallDir" Root="HKLM" Key="[%agent_regpath%]\Installer" Name="InstallDir" Type="raw" />
     </Property>
 
     <Property Id="QUICKINSTALL" Secure="yes">