diff --git a/Makefile b/Makefile
index 58589b0..b6a7cea 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ $(Status)/dist: $(Status)/wix
 $(Status)/wix: $(Status)/sshfs-win
 	mkdir -p $(WixDir)
 	cp sshfs-win.wxs $(WixDir)/
-	candle -nologo -arch x86 -pedantic\
+	candle -nologo -arch $(MyArch) -pedantic\
 		-dMyProductName=$(MyProductName)\
 		-dMyCompanyName=$(MyCompanyName)\
 		-dMyDescription=$(MyDescription)\
@@ -46,7 +46,7 @@ $(Status)/wix: $(Status)/sshfs-win
 	heat dir $(shell cygpath -aw $(RootDir))\
 		-nologo -dr INSTALLDIR -cg C.Main -srd -ke -sreg -gg -sfrag\
 		-o $(shell cygpath -aw $(WixDir)/root.wxs)
-	candle -nologo -arch x86 -pedantic\
+	candle -nologo -arch $(MyArch) -pedantic\
 		-dMyProductName=$(MyProductName)\
 		-dMyCompanyName=$(MyCompanyName)\
 		-dMyDescription=$(MyDescription)\
diff --git a/sshfs-win.wxs b/sshfs-win.wxs
index 0d30741..8d79f61 100644
--- a/sshfs-win.wxs
+++ b/sshfs-win.wxs
@@ -5,9 +5,13 @@
 <?if $(var.MyArch) = x64?>
     <?define UpgradeCode="$(var.UpgradeCode64)"?>
     <?define OtherUpgradeCode="$(var.UpgradeCode32)"?>
+    <?define ProgramFilesFolder="ProgramFiles64Folder"?>
+    <?define LauncherRegistryKey="Software\WOW6432Node\WinFsp\Services"?>
 <?else?>
     <?define UpgradeCode="$(var.UpgradeCode32)"?>
     <?define OtherUpgradeCode="$(var.UpgradeCode64)"?>
+    <?define ProgramFilesFolder="ProgramFilesFolder"?>
+    <?define LauncherRegistryKey="Software\WinFsp\Services"?>
 <?endif?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
@@ -39,7 +43,7 @@
             NOT OTHERINSTALLED
         </Condition>
 
-        <Property Id="P.LauncherRegistryKey">Software\WinFsp\Services</Property>
+        <Property Id="P.LauncherRegistryKey">$(var.LauncherRegistryKey)</Property>
         <Property Id="P.RegistryKey">Software\$(var.MyProductName)</Property>
         <Property Id="INSTALLDIR">
             <RegistrySearch
@@ -51,7 +55,7 @@
         </Property>
 
         <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <Directory Id="$(var.ProgramFilesFolder)">
                 <Directory Id="INSTALLDIR" Name="$(var.MyProductName)" />
             </Directory>
         </Directory>