diff --git a/aarch64/Makefile b/aarch64/Makefile
new file mode 100644
index 0000000..f72e306
--- /dev/null
+++ b/aarch64/Makefile
@@ -0,0 +1,3 @@
+CDO_ENV = ALT_STRUCT_SIZE=12 BUG_STRUCT_SIZE=12 EX_STRUCT_SIZE=12 JUMP_STRUCT_SIZE=16 PRINTK_INDEX_STRUCT_SIZE=44
+
+include ../../Makefile.include
diff --git a/aarch64/cmdline-patch.ORIG.o b/aarch64/cmdline-patch.ORIG.o
new file mode 100644
index 0000000..85e76c4
Binary files /dev/null and b/aarch64/cmdline-patch.ORIG.o differ
diff --git a/aarch64/cmdline-patch.PATCHED.o b/aarch64/cmdline-patch.PATCHED.o
new file mode 100644
index 0000000..dcf88de
Binary files /dev/null and b/aarch64/cmdline-patch.PATCHED.o differ
diff --git a/aarch64/cmdline-patch.test b/aarch64/cmdline-patch.test
new file mode 100755
index 0000000..3e130b0
--- /dev/null
+++ b/aarch64/cmdline-patch.test
@@ -0,0 +1,6 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t cmdline_proc_show
+
+assert_num_funcs 1
diff --git a/aarch64/cmdline-ubsan.ORIG.o b/aarch64/cmdline-ubsan.ORIG.o
new file mode 100644
index 0000000..c09c627
Binary files /dev/null and b/aarch64/cmdline-ubsan.ORIG.o differ
diff --git a/aarch64/cmdline-ubsan.PATCHED.o b/aarch64/cmdline-ubsan.PATCHED.o
new file mode 100644
index 0000000..96acb88
Binary files /dev/null and b/aarch64/cmdline-ubsan.PATCHED.o differ
diff --git a/aarch64/cmdline-ubsan.test b/aarch64/cmdline-ubsan.test
new file mode 100755
index 0000000..0bd0f95
--- /dev/null
+++ b/aarch64/cmdline-ubsan.test
@@ -0,0 +1,7 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# $ nm cmdline-ubsan.OUTPUT.o | grep -i " t "
+# 0000000000000008 t cmdline_proc_show
+
+assert_num_funcs 1
diff --git a/aarch64/data-new.ORIG.o b/aarch64/data-new.ORIG.o
new file mode 100644
index 0000000..8002f73
Binary files /dev/null and b/aarch64/data-new.ORIG.o differ
diff --git a/aarch64/data-new.PATCHED.o b/aarch64/data-new.PATCHED.o
new file mode 100644
index 0000000..9901182
Binary files /dev/null and b/aarch64/data-new.PATCHED.o differ
diff --git a/aarch64/data-new.test b/aarch64/data-new.test
new file mode 100755
index 0000000..c0ec0f1
--- /dev/null
+++ b/aarch64/data-new.test
@@ -0,0 +1,6 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t meminfo_proc_show
+
+assert_num_funcs 1
diff --git a/aarch64/gcc-static-local-var-6.ORIG.o b/aarch64/gcc-static-local-var-6.ORIG.o
new file mode 100644
index 0000000..98b0320
Binary files /dev/null and b/aarch64/gcc-static-local-var-6.ORIG.o differ
diff --git a/aarch64/gcc-static-local-var-6.PATCHED.o b/aarch64/gcc-static-local-var-6.PATCHED.o
new file mode 100644
index 0000000..27cb089
Binary files /dev/null and b/aarch64/gcc-static-local-var-6.PATCHED.o differ
diff --git a/aarch64/gcc-static-local-var-6.test b/aarch64/gcc-static-local-var-6.test
new file mode 100755
index 0000000..946c834
--- /dev/null
+++ b/aarch64/gcc-static-local-var-6.test
@@ -0,0 +1,6 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t __nf_ip6_route
+
+assert_num_funcs 1
diff --git a/aarch64/meminfo-string.ORIG.o b/aarch64/meminfo-string.ORIG.o
new file mode 100644
index 0000000..8002f73
Binary files /dev/null and b/aarch64/meminfo-string.ORIG.o differ
diff --git a/aarch64/meminfo-string.PATCHED.o b/aarch64/meminfo-string.PATCHED.o
new file mode 100644
index 0000000..f04d4d2
Binary files /dev/null and b/aarch64/meminfo-string.PATCHED.o differ
diff --git a/aarch64/meminfo-string.test b/aarch64/meminfo-string.test
new file mode 100755
index 0000000..c0ec0f1
--- /dev/null
+++ b/aarch64/meminfo-string.test
@@ -0,0 +1,6 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t meminfo_proc_show
+
+assert_num_funcs 1
diff --git a/aarch64/new-function.ORIG.o b/aarch64/new-function.ORIG.o
new file mode 100644
index 0000000..84a3099
Binary files /dev/null and b/aarch64/new-function.ORIG.o differ
diff --git a/aarch64/new-function.PATCHED.o b/aarch64/new-function.PATCHED.o
new file mode 100644
index 0000000..a009fd9
Binary files /dev/null and b/aarch64/new-function.PATCHED.o differ
diff --git a/aarch64/new-function.test b/aarch64/new-function.test
new file mode 100755
index 0000000..80ae8ba
--- /dev/null
+++ b/aarch64/new-function.test
@@ -0,0 +1,7 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t kpatch_n_tty_write
+# 0000000000000008 t n_tty_write
+
+assert_num_funcs 2
diff --git a/aarch64/special-static.ORIG.o b/aarch64/special-static.ORIG.o
new file mode 100644
index 0000000..cf41f88
Binary files /dev/null and b/aarch64/special-static.ORIG.o differ
diff --git a/aarch64/special-static.PATCHED.o b/aarch64/special-static.PATCHED.o
new file mode 100644
index 0000000..262c3ac
Binary files /dev/null and b/aarch64/special-static.PATCHED.o differ
diff --git a/aarch64/special-static.test b/aarch64/special-static.test
new file mode 100755
index 0000000..a8258a9
--- /dev/null
+++ b/aarch64/special-static.test
@@ -0,0 +1,6 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t copy_signal
+
+assert_num_funcs 1
diff --git a/aarch64/syscall.ORIG.o b/aarch64/syscall.ORIG.o
new file mode 100644
index 0000000..8815c7e
Binary files /dev/null and b/aarch64/syscall.ORIG.o differ
diff --git a/aarch64/syscall.PATCHED.o b/aarch64/syscall.PATCHED.o
new file mode 100644
index 0000000..4a37d47
Binary files /dev/null and b/aarch64/syscall.PATCHED.o differ
diff --git a/aarch64/syscall.test b/aarch64/syscall.test
new file mode 100755
index 0000000..cd54878
--- /dev/null
+++ b/aarch64/syscall.test
@@ -0,0 +1,7 @@
+#!/bin/bash
+source $KPATCH_TEST_LIBRARY
+
+# 0000000000000008 t __arm64_sys_newuname
+# 0000000000000000 t __kpatch_do_sys_newuname
+
+assert_num_funcs 2