diff --git a/src/Makefile b/src/Makefile
index 269a70933e5e..d6afa99b6ab0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,7 +39,7 @@ endif
 endif
 
 # To get ARM stack traces if Redis crashes we need a special C flag.
-ifneq (,$(findstring armv,$(uname_M)))
+ifneq (,$(filter aarch64 armv,$(uname_M)))
         CFLAGS+=-funwind-tables
 endif
 
diff --git a/src/debug.c b/src/debug.c
index 293dbe36e4e6..f239eea5a2cb 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -688,6 +688,8 @@ static void *getMcontextEip(ucontext_t *uc) {
     return (void*) uc->uc_mcontext.sc_ip;
     #elif defined(__arm__) /* Linux ARM */
     return (void*) uc->uc_mcontext.arm_pc;
+    #elif defined(__aarch64__) /* Linux AArch64 */
+    return (void*) uc->uc_mcontext.pc;
     #endif
 #else
     return NULL;