diff --git a/README.md b/README.md
index 3fa897e9d..47bf6b054 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ rsync -az --info=progress2 * testuser@testhost:/home/testuser/nacl-test
 Then on the test machine,
 
 ```
-scons --mode=opt-linux,nacl saigo=1 platform=arm small_tests medium_tests large_tests
+scons --mode=opt-linux,nacl saigo=1 platform=arm built_elsewhere=1 naclsdk_validate=0 small_tests medium_tests large_tests
 ```
 
 
diff --git a/SConstruct b/SConstruct
index bf6d48505..d70ace31e 100755
--- a/SConstruct
+++ b/SConstruct
@@ -1328,10 +1328,12 @@ def ApplyTLSEdit(env, nexe_name, raw_nexe):
     tls_edit_exe = env.File(env.SConstructAbsPath(tls_edit_forced))
   else:
     tls_edit_exe = env['BUILD_ENV'].File('${STAGING_DIR}/tls_edit${PROGSUFFIX}')
-  return env.Command(
+  node = env.Command(
       nexe_name,
       [tls_edit_exe, raw_nexe],
       '${SOURCES[0]} --verbose ${SOURCES[1:]} ${TARGET}')
+  env.Alias('all_programs', node)  # Technically incorrect for the IRT which is not a program.
+  return node
 
 pre_base_env.AddMethod(ApplyTLSEdit)
 
@@ -2535,7 +2537,7 @@ def SetUpLinuxEnvX86(env):
                   LD='i686-linux-gnu-ld')
 
 def SetUpLinuxEnvArm(env):
-  if not platform.machine().startswith('arm'):
+  if not platform.machine().startswith('a'):
     # Allow emulation on non-ARM hosts.
     env.Replace(EMULATOR='qemu-armhf -L /usr/arm-linux-gnueabihf/ -cpu cortex-a9')
   if env.Bit('built_elsewhere'):
diff --git a/pynacl/platform.py b/pynacl/platform.py
index 7d195c859..ca637936d 100644
--- a/pynacl/platform.py
+++ b/pynacl/platform.py
@@ -132,6 +132,8 @@ def GetArch3264(machine=None):
   machine = machine.lower()
   if machine == 'arm64' and GetOS() == OS_MAC:
     machine = ARCH3264_X86_64 # force Intel cross build
+  elif machine == 'aarch64' and GetOS() == OS_LINUX:
+    machine = ARCH3264_ARM
   assert machine in ARCH3264_DICT, "Unrecognized arch machine: %s" % machine
   return ARCH3264_DICT[machine]