diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4543eca591..8f7c6b1ea4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -25,6 +25,7 @@
 Anders Hasselqvist <anders.hasselqvist@gmail.com>
 Bei Li <beil@google.com>
 Gabe Kopley <gabe@philo.com>
+Haoming Chen <hmchen@google.com>
 Jacob Trimble <modmaker@google.com>
 Joey Parrish <joeyparrish@google.com>
 Kongqun Yang <kqyang@google.com>
diff --git a/appveyor.yml b/appveyor.yml
index 5c7e689d04..d49c9dd258 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,16 +18,22 @@ install:
 before_build:
   - cd ..
   - depot_tools\gclient config https://github.com/google/shaka-packager.git --name=src --unmanaged
+  - set GYP_DEFINES='target_arch="%PLATFORM%"'
   - depot_tools\gclient sync
+  - if [%PLATFORM%] == [x64] (
+      set "output_directory=%CONFIGURATION%_x64"
+    ) else (
+      set "output_directory=%CONFIGURATION%"
+    )
 
 build_script:
   - cd src
-  - ..\depot_tools\ninja -C "out\%CONFIGURATION%" -k 100
-  - copy "out\%CONFIGURATION%\packager.exe" packager-win.exe
+  - ..\depot_tools\ninja -C "out\%OUTPUT_DIRECTORY%" -k 100
+  - copy "out\%OUTPUT_DIRECTORY%\packager.exe" packager-win.exe
 
 test_script:
-  - for %%f in ("out\%CONFIGURATION%\*_*test.exe") do (%%f || exit /b 666)
-  - python "out\%CONFIGURATION%\packager_test.py" -v
+  - for %%f in ("out\%OUTPUT_DIRECTORY%\*_*test.exe") do (%%f || exit /b 666)
+  - python "out\%OUTPUT_DIRECTORY%\packager_test.py" -v
 
 artifacts:
   - path: packager-win.exe