--- a/common.py
+++ b/common.py
@@ -16,17 +16,17 @@ def getSupportedPlatforms():
 
 def getPlatformFtpDir(platform):
     platform_ftp_map = {
         'linux': 'linux-i686',
         'linux64': 'linux-x86_64',
         'macosx': 'mac',
         'macosx64': 'mac',
         'win32': 'win32',
-        'win64': 'win64-x86_64',
+        'win64': 'win64',
         'android': 'android-r7',
     }
     return platform_ftp_map.get(platform)
 
 
 def genBuildID(now=None):
     """Return a buildid based on the current time"""
     if not now:

--- a/process/factory.py
+++ b/process/factory.py
@@ -639,17 +639,17 @@ class MozillaBuildFactory(RequestSorting
             packageFilename = '*.linux-x86_64*.tar.bz2'
         elif platform.startswith("linux"):
             packageFilename = '*.linux-i686*.tar.bz2'
         elif platform.startswith("macosx"):
             packageFilename = '*.dmg'
         elif platform.startswith("win32"):
             packageFilename = '*.win32.zip'
         elif platform.startswith("win64"):
-            packageFilename = '*.win64-x86_64.zip'
+            packageFilename = '*.win64.zip'
         else:
             return False
         return packageFilename
 
     def getInstallerFilename(self):
         return '*.installer.exe'
 
     def parseFileSize(self, propertyName):