diff --git a/deps/udns/configure b/deps/udns/configure
index afc377a671..1cbac6b308 100755
--- a/deps/udns/configure
+++ b/deps/udns/configure
@@ -142,12 +142,6 @@ else
 EOF
 fi
 
-# HACK FIXME - use 32bit on Mac
-os=`uname -s`;
-if [ $os = "Darwin"  ]; then
-  CFLAGS="$CFLAGS -m32"
-fi
-
 ac_config_h
 ac_output Makefile
 ac_msg "creating config.status"
diff --git a/wscript b/wscript
index ffac79a6c4..575e1a4a8c 100644
--- a/wscript
+++ b/wscript
@@ -99,24 +99,12 @@ def configure(conf):
   debug_env.set_variant('debug')
   debug_env.append_value('CCFLAGS', ['-DDEBUG', '-g', '-O0', '-Wall', '-Wextra'])
   debug_env.append_value('CXXFLAGS', ['-DDEBUG', '-g', '-O0', '-Wall', '-Wextra'])
-
-  # HACK FIXME - use 32bit on Mac
-  if platform.system() == "Darwin":
-    debug_env.append_value('CCFLAGS', '-m32')
-    debug_env.append_value('CXXFLAGS', '-m32')
-
   conf.write_config_header("config.h")
 
   # Configure default variant
   conf.setenv('default')
   conf.env.append_value('CCFLAGS', ['-DNDEBUG', '-O3'])
   conf.env.append_value('CXXFLAGS', ['-DNDEBUG', '-O3'])
-
-  # HACK FIXME - use 32bit on Mac
-  if platform.system() == "Darwin":
-    conf.env.append_value('CCFLAGS', '-m32')
-    conf.env.append_value('CXXFLAGS', '-m32')
-
   conf.write_config_header("config.h")
 
 def build_udns(bld):
@@ -154,9 +142,10 @@ def build_udns(bld):
 # XXX Remove this when v8 defaults x86_64 to native builds
 def GuessArchitecture():
   id = platform.machine()
+  arch = platform.architecture()[0]
   if id.startswith('arm'):
     return 'arm'
-  elif '64' in id:
+  elif ('64' in id) or ('64' in arch):
     return 'x64'
   elif (not id) or (not re.match('(x|i[3-6])86', id) is None):
     return 'ia32'
@@ -178,9 +167,6 @@ def build_v8(bld):
   if GuessArchitecture() == "x64":
     arch = "arch=x64"
 
-  # HACK FIXME - use 32bit on Mac
-  if platform.system() == "Darwin": arch = "arch=ia32";
-
   v8 = bld.new_task_gen(
     target = join("deps/v8", bld.env["staticlib_PATTERN"] % "v8"),
     rule=v8rule % (v8dir_tgt, scons, "release", arch),
@@ -192,10 +178,6 @@ def build_v8(bld):
   bld.env_of_name('default')["LIBPATH_V8"] = v8dir_tgt
   bld.env_of_name('default')["LINKFLAGS_V8"] = ["-pthread"]
 
-  # HACK FIXME - use 32bit on Mac
-  if platform.system() == "Darwin":
-    bld.env_of_name('default')["LINKFLAGS_V8"] = ["-pthread", "-m32"]
-
   ### v8 debug
   if bld.env["USE_DEBUG"]:
     deps_tgt = join(bld.srcnode.abspath(bld.env_of_name("debug")),"deps")
@@ -205,11 +187,6 @@ def build_v8(bld):
     bld.env_of_name('debug')["STATICLIB_V8"] = "v8_g"
     bld.env_of_name('debug')["LIBPATH_V8"] = v8dir_tgt
     bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread"]
-
-    # HACK FIXME - use 32bit on Mac
-    if platform.system() == "Darwin":
-      bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread", "-m32"]
-
     v8_debug.rule = v8rule % (v8dir_tgt, scons, "debug", arch)
     v8_debug.target = join("deps/v8", bld.env["staticlib_PATTERN"] % "v8_g")