--- msvc9compiler.py	2009-03-07 02:12:09.000000000 +0100
+++ b.msvc9compiler.py	2009-12-16 12:29:26.000000000 +0100
@@ -205,7 +205,7 @@
     newVariable = os.pathsep.join(newList)
     return newVariable
 
-def find_vcvarsall(version):
+def find_vcvarsall(version, arch):
     """Find the vcvarsall.bat file
 
     At first it tries to find the productdir of VS 2008 in the registry. If
@@ -234,6 +234,12 @@
     if not productdir:
         log.debug("No productdir found")
         return None
+
+    if arch == "amd64":
+        vcvarsall = os.path.join(productdir, "bin\\vcvars64.bat")
+        if os.path.isfile(vcvarsall):
+            return vcvarsall
+
     vcvarsall = os.path.join(productdir, "vcvarsall.bat")
     if os.path.isfile(vcvarsall):
         return vcvarsall
@@ -243,7 +249,7 @@
 def query_vcvarsall(version, arch="x86"):
     """Launch vcvarsall.bat and read the settings from its environment
     """
-    vcvarsall = find_vcvarsall(version)
+    vcvarsall = find_vcvarsall(version, arch)
     interesting = set(("include", "lib", "libpath", "path"))
     result = {}