diff --git a/appveyor.yml b/appveyor.yml
index c3d24925d..b090aeea0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,8 @@ environment:
   BOOST_DIR: C:\dev\boost_1_63_0
   WXDIR: C:\dev\wxwidgets
   WXSHARED: SHARED=0
-  FORCE_WX_BUILD: 1
-  FORCE_BOOST_REINSTALL: 1
+  FORCE_WX_BUILD: 0
+  FORCE_BOOST_REINSTALL: 0
   ENC_SECRET:
     secure: QfeTOSKXz1uFCEACqFKLNw==
   UPLOAD_USER:
diff --git a/package/win/package_win32.ps1 b/package/win/package_win32.ps1
index 717b30488..67d120450 100644
--- a/package/win/package_win32.ps1
+++ b/package/win/package_win32.ps1
@@ -43,8 +43,12 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
 cpanm "PAR::Packer"
 if ($env:ARCH -eq "32bit") { 
 	$perlarch = "sjlj"
+	$glut = "libglut-0_.dll"
+	$pthread= "pthreadGC2-w32.dll"
 } else {
 	$perlarch = "seh"
+	$glut = "libglut-0__.dll"
+	$pthread= "pthreadGC2-w64.dll"
 }
 
 
@@ -62,9 +66,8 @@ pp `
 -a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll"  `
 -a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_${perlarch}-1.dll;libgcc_s_${perlarch}-1.dll"  `
 -a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll"  `
--a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w64.dll;pthreadGC2-w64.dll"  `
--a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w32.dll;pthreadGC2-w32.dll"  `
--a "${STRAWBERRY_PATH}\c\bin\libglut-0__.dll;libglut-0__.dll"  `
+-a "${STRAWBERRY_PATH}\c\bin\${pthread};${pthread}"  `
+-a "${STRAWBERRY_PATH}\c\bin\${glut};${glut}"  `
 -M AutoLoader `
 -M B `
 -M Carp `