diff --git a/packaging/windows/msi-wrapped.wxs b/packaging/windows/msi-wrapped.wxs
index e5fdaf0..75e301e 100644
--- a/packaging/windows/msi-wrapped.wxs
+++ b/packaging/windows/msi-wrapped.wxs
@@ -37,14 +37,15 @@
     <Property Id="MSIINSTALLPERUSER" Secure="yes" Value="1" />
     <Property Id="REBOOT" Value="ReallySuppress" />
 
-    <Property Id="FarmControlUpdateLog" Value="[FarmControlUpdatesDir]install.log" />
-
     <Binary Id="WrappedExe" SourceFile="__SETUP_EXE__" />
 
+    <!-- ExeCommand is a Formatted field, so [FarmControlUpdatesDir] resolves to the
+         real per-user path here. An intermediate Property would not resolve it
+         (property values are not recursively formatted). -->
     <CustomAction
       Id="RunInstaller"
       BinaryKey="WrappedExe"
-      ExeCommand="/S /UPDATE /RESTARTFC /LOG=&quot;[FarmControlUpdateLog]&quot;"
+      ExeCommand="/S /UPDATE /RESTARTFC /LOG=&quot;[FarmControlUpdatesDir]install.log&quot;"
       Execute="immediate"
       Impersonate="yes"
       Return="check" />
@@ -55,6 +56,10 @@
           <Directory Id="FarmControlUpdatesDir" Name="Updates">
             <Component Id="UpdatesFolderComponent" Guid="A1B2C3D4-E5F6-7890-ABCD-EF1234567890">
               <CreateFolder />
+              <!-- ICE64: per-user directories must be scheduled for removal on uninstall. -->
+              <RemoveFile Id="RemoveUpdatesFiles" Directory="FarmControlUpdatesDir" Name="*" On="uninstall" />
+              <RemoveFolder Id="RemoveFarmControlUpdatesDir" Directory="FarmControlUpdatesDir" On="uninstall" />
+              <RemoveFolder Id="RemoveFarmControlAppDataDir" Directory="FarmControlAppDataDir" On="uninstall" />
               <RegistryValue
                 Root="HKCU"
                 Key="Software\Tom Butcher\Farm Control"