diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index 572e096f1c3..8452677020c 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -117,10 +117,10 @@ index dbf6aa7..f87dba8 100644
  jemalloc_postfork_child
 diff --git a/include/jemalloc/jemalloc_FreeBSD.h b/include/jemalloc/jemalloc_FreeBSD.h
 new file mode 100644
-index 0000000..66d6da5
+index 0000000..c5113b9
 --- /dev/null
 +++ b/include/jemalloc/jemalloc_FreeBSD.h
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,144 @@
 +/*
 + * Override settings that were generated in jemalloc_defs.h as necessary.
 + */
@@ -163,6 +163,9 @@ index 0000000..66d6da5
 +#ifdef __arm__
 +#  define LG_SIZEOF_PTR		2
 +#endif
++#ifdef __aarch64__
++#  define LG_SIZEOF_PTR		3
++#endif
 +#ifdef __mips__
 +#ifdef __mips_n64
 +#  define LG_SIZEOF_PTR		3
@@ -180,6 +183,10 @@ index 0000000..66d6da5
 +#  define JEMALLOC_TLS_MODEL	/* Default. */
 +#endif
 +
++#ifndef CPU_SPINWAIT
++#  define CPU_SPINWAIT do {} while (0)
++#endif
++
 +#define	STATIC_PAGE_SHIFT	PAGE_SHIFT
 +#define	LG_SIZEOF_INT		2
 +#define	LG_SIZEOF_LONG		LG_SIZEOF_PTR
diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
index bd2ba66b578..c5113b99330 100644
--- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
+++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
@@ -40,6 +40,9 @@
 #ifdef __arm__
 #  define LG_SIZEOF_PTR		2
 #endif
+#ifdef __aarch64__
+#  define LG_SIZEOF_PTR		3
+#endif
 #ifdef __mips__
 #ifdef __mips_n64
 #  define LG_SIZEOF_PTR		3