diff --git a/shlr/Makefile b/shlr/Makefile
index 2c0a1655a0..2dad8f880c 100644
--- a/shlr/Makefile
+++ b/shlr/Makefile
@@ -39,7 +39,7 @@ ifeq ($(USE_CS4),1)
 CS_TIP=a7cac8352f7397aa73bb2e2dcc1b6cdb2e1b8461
 CS_BRA=v4
 else
-CS_TIP=f36795e36a227a686e634680d5ebc0730a319a2f
+CS_TIP=a4ae97c08fe8d1489d20d462c370cdeb3231cea5
 CS_BRA=next
 endif
 ifeq ($(CS_COMMIT_ARCHIVE),1)
diff --git a/shlr/meson.build b/shlr/meson.build
index fe61ead1e0..02bf7238ff 100644
--- a/shlr/meson.build
+++ b/shlr/meson.build
@@ -20,7 +20,7 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
     patches_files = []
     # NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/Makefile
     if capstone_version == 'v5'
-      CS_TIP = 'f36795e36a227a686e634680d5ebc0730a319a2f'
+      CS_TIP = 'a4ae97c08fe8d1489d20d462c370cdeb3231cea5'
       CS_BRA = 'next'
       patches_files = [
         'fix-x86-16.patch',
diff --git a/test/db/anal/arm64 b/test/db/anal/arm64
index b39f4238d2..e09036af99 100644
--- a/test/db/anal/arm64
+++ b/test/db/anal/arm64
@@ -208,8 +208,8 @@ EOF
 EXPECT=<<EOF
 afvR
    var_10h  0x8,0xc
-   var_20h
-    var_8h
+   var_20h  0x14
+    var_8h  0xc
 afvW
    var_10h  0x4
    var_20h  0x0