diff --git a/configure b/configure
index 7bf4536..fafd7aa 100755
--- a/configure
+++ b/configure
@@ -259,10 +259,6 @@ def host_arch():
   return arch


-def target_arch():
-  return host_arch()
-
-
 def compiler_version():
   proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
   version_line = proc.communicate()[0].split('\n')[0]
@@ -287,9 +283,12 @@ def configure_node(o):
   o['variables']['node_install_npm'] = b(not options.without_npm)
   o['variables']['node_install_waf'] = b(not options.without_waf)
   o['variables']['host_arch'] = host_arch()
-  o['variables']['target_arch'] = options.dest_cpu or target_arch()
   o['default_configuration'] = 'Debug' if options.debug else 'Release'

+  target_arch = options.dest_cpu or host_arch()
+  o['variables']['target_arch'] = target_arch
+  if target_arch == 'arm': o['variables']['armv7'] = 0 # FIXME
+
   cc_version, is_clang = compiler_version()

   # turn off strict aliasing if gcc < 4.6.0 unless it's llvm-gcc
diff --git a/Makefile b/Makefile
index 0000000..0000000 100755
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,10 @@
 	$(PYTHON) tools/gyp_node -f make
 
 install: all
-	out/Release/node tools/installer.js install $(DESTDIR)
+	/usr/bin/node tools/installer.js install $(DESTDIR)
 
 uninstall:
-	out/Release/node tools/installer.js uninstall
+	/usr/bin/node tools/installer.js uninstall
 
 clean:
 	-rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md