diff --git a/common.py b/common.py
index e7941262e52..b74b204a04f 100644
--- a/common.py
+++ b/common.py
@@ -30,6 +30,7 @@ _machine_map = {
 	'i586': 'x86',
 	'i686': 'x86',
 	'ppc' : 'ppc',
+	'AMD64': 'x86_64',
 	'x86_64': 'x86_64',
 }
 
diff --git a/scons/gallium.py b/scons/gallium.py
index 76bfde1c1b7..9118257ac05 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -203,6 +203,7 @@ def generate(env):
         'i586': 'x86',
         'i686': 'x86',
         'ppc' : 'ppc',
+        'AMD64': 'x86_64',
         'x86_64': 'x86_64',
     }.get(host_machine, 'generic')
     env['crosscompile'] = platform != host_platform