diff --git a/build/scripts/unpackJdks.gant b/build/scripts/unpackJdks.gant
index 8bb53c134348..7cd7c82b0577 100644
--- a/build/scripts/unpackJdks.gant
+++ b/build/scripts/unpackJdks.gant
@@ -49,7 +49,7 @@ def unpackJdks() {
 private void unpackJdk(File osDir, File jdkDir, String majorVersion) {
   def jdkFiles = osDir.listFiles().findAll { it.name.startsWith("jdk$majorVersion") }
   if (SystemInfo.isWindows) {
-    def arch = "x64"
+    def arch = System.getenv("ProgramFiles(x86)") != null ? "x64" : "x32"
     jdkFiles = jdkFiles.findAll { it.name.endsWith("_${arch}.zip") }
   }
   if (jdkFiles.empty) {