diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index a2bc3d5d..8e7bf1ed 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -301,9 +301,16 @@
         </DirectoryRef>
         <DirectoryRef Id="OPTDIR">
             <Directory Id="OPTDIR.cygfuse" Name="cygfuse" FileSource="..\..\..\opt\cygfuse\dist">
-                <Component Id="C.fuse.tar.xz">
-                    <File Name="fuse-2.8-5.tar.xz" KeyPath="yes" />
-                </Component>
+                <Directory Id="OPTDIR.cygfuse.x64" Name="x64">
+                    <Component Id="C.fuse.tar.xz.x64">
+                        <File Id="FILE.fuse.tar.xz.x64" Name="fuse-2.8-5.tar.xz" KeyPath="yes" />
+                    </Component>
+                </Directory>
+                <Directory Id="OPTDIR.cygfuse.x86" Name="x86">
+                    <Component Id="C.fuse.tar.xz.x86">
+                        <File Id="FILE.fuse.tar.xz.x86" Name="fuse-2.8-5.tar.xz" KeyPath="yes" />
+                    </Component>
+                </Directory>
                 <Component Id="C.fuse.install.sh">
                     <File Name="install.sh" KeyPath="yes" />
                 </Component>
@@ -460,7 +467,8 @@
             <ComponentRef Id="C.fuse_x86.pc" />
         </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.opt.fuse">
-            <ComponentRef Id="C.fuse.tar.xz" />
+            <ComponentRef Id="C.fuse.tar.xz.x64" />
+            <ComponentRef Id="C.fuse.tar.xz.x86" />
             <ComponentRef Id="C.fuse.install.sh" />
             <ComponentRef Id="C.fuse.uninstall.sh" />
         </ComponentGroup>
@@ -568,7 +576,7 @@
                 Id="F.Cygfuse"
                 Level="1000"
                 Title="FUSE for Cygwin"
-                Description="From a Cygwin prompt change to $InstallDir/opt/cygfuse and run install.sh."
+                Description="From a Cygwin prompt change to &lt;InstallDir&gt;/opt/cygfuse and run install.sh."
                 AllowAdvertise="no"
                 InstallDefault="local"
                 Absent="allow">
diff --git a/opt/cygfuse/dist/install.sh b/opt/cygfuse/dist/install.sh
index 29590ac5..1f687bf1 100644
--- a/opt/cygfuse/dist/install.sh
+++ b/opt/cygfuse/dist/install.sh
@@ -1 +1,7 @@
-tar -C/ -xaf fuse-2.8-*.tar.xz
+cd "$(dirname "$0")"
+case $(uname -m) in
+x86_64)
+    tar -C/ -xaf x64/fuse-2.8-*.tar.xz ;;
+*)
+    tar -C/ -xaf x86/fuse-2.8-*.tar.xz ;;
+esac
diff --git a/opt/cygfuse/dist/uninstall.sh b/opt/cygfuse/dist/uninstall.sh
index a910fe1f..b2b9e990 100644
--- a/opt/cygfuse/dist/uninstall.sh
+++ b/opt/cygfuse/dist/uninstall.sh
@@ -1 +1,7 @@
-tar -taf fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f
+cd "$(dirname "$0")"
+case $(uname -m) in
+x86_64)
+    tar -taf x64/fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f ;;
+*)
+    tar -taf x86/fuse-2.8-*.tar.xz | sed -e '/\/$/d' -e 's/.*/\/&/' | xargs rm -f ;;
+esac
diff --git a/opt/cygfuse/dist/fuse-2.8-5.tar.xz b/opt/cygfuse/dist/x64/fuse-2.8-5.tar.xz
similarity index 100%
rename from opt/cygfuse/dist/fuse-2.8-5.tar.xz
rename to opt/cygfuse/dist/x64/fuse-2.8-5.tar.xz
diff --git a/opt/cygfuse/dist/x86/fuse-2.8-5.tar.xz b/opt/cygfuse/dist/x86/fuse-2.8-5.tar.xz
new file mode 100644
index 00000000..7c1715bd
Binary files /dev/null and b/opt/cygfuse/dist/x86/fuse-2.8-5.tar.xz differ