diff --git a/include/std/fenv.e b/include/std/fenv.e
index 6b7d2081..1d6ba89d 100644
--- a/include/std/fenv.e
+++ b/include/std/fenv.e
@@ -28,7 +28,7 @@ public constant FE_INEXACT = 'e',
 	 FE_INVALID   = 'i',
 	 FE_ALL_EXCEPT = "eiouz"
 
-ifdef ARM then
+ifdef ARM or ARM64 then
         type enum c_fe by *2
                 C_FE_INVALID = 1,
                 C_FE_DIVBYZERO = 2,
diff --git a/source/be_machine.c b/source/be_machine.c
index 8bd2bd3c..9212064f 100644
--- a/source/be_machine.c
+++ b/source/be_machine.c
@@ -3399,6 +3399,8 @@ object machine(object opcode, object x)
                     s1_ptr s = NewS1(2);
                 #if (__ia64__) || (_IA64) || (__IA64__) || (__amd64__)
                     s->base[1] = NewString("X86_64");
+                #elif __aarch64__
+                    s->base[1] = NewString("ARM64");
                 #elif __i386__
                     s->base[1] = NewString("X86");
                 #elif __arm__