diff --git a/build-aux/config.sub b/build-aux/config.sub
index 4a8c458f..6ae25027 100644
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1181,7 +1181,7 @@ case $cpu-$vendor in
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64c | aarch64_be \
+			| aarch64 | aarch64_be \
 			| abacus \
 			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
diff --git a/builds/Makefile.in b/builds/Makefile.in
index b710e5ed..20b1f2e7 100644
--- a/builds/Makefile.in
+++ b/builds/Makefile.in
@@ -370,7 +370,14 @@ EXTRA_DIST = \
 	msvc/vs2019/libsodium/libsodium.xml \
 	msvc/vs2019/libsodium.import.props \
 	msvc/vs2019/libsodium.import.xml \
-	msvc/vs2019/libsodium.sln
+	msvc/vs2022/libsodium.sln \
+	msvc/vs2022/libsodium/libsodium.props \
+	msvc/vs2022/libsodium/libsodium.vcxproj \
+	msvc/vs2022/libsodium/libsodium.vcxproj.filters \
+	msvc/vs2022/libsodium/libsodium.xml \
+	msvc/vs2022/libsodium.import.props \
+	msvc/vs2022/libsodium.import.xml \
+	msvc/vs2022/libsodium.sln
 
 all: all-am
 
diff --git a/configure b/configure
index 95294f8a..e738300f 100755
--- a/configure
+++ b/configure
@@ -18558,11 +18558,32 @@ then :
 printf %s "checking for ARM crypto instructions set... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <arm_neon.h>
+
+      #ifdef __clang__
+      #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+      #elif defined(__GNUC__)
+      #  pragma GCC target("+simd+crypto")
+      #endif
+      #ifndef __ARM_FEATURE_CRYPTO
+      #  define __ARM_FEATURE_CRYPTO 1
+      #endif
+      #ifndef __ARM_FEATURE_AES
+      #  define __ARM_FEATURE_AES 1
+      #endif
+
+      #include <arm_neon.h>
+
 int
 main (void)
 {
- vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(__ARM_FEATURE_CRYPTO))
+
+      vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(0));
+
+      #ifdef __clang__
+      #  pragma clang attribute pop
+      #endif
+      (void) 0
+
   ;
   return 0;
 }
@@ -18620,11 +18641,30 @@ then :
 printf %s "checking for ARM crypto instructions set with -march=armv8-a+crypto+aes... " >&6; }
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <arm_neon.h>
+
+            #ifdef __clang__
+            #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+            #elif defined(__GNUC__)
+            #  pragma GCC target("+simd+crypto")
+            #endif
+            #ifndef __ARM_FEATURE_CRYPTO
+            #  define __ARM_FEATURE_CRYPTO 1
+            #endif
+            #ifndef __ARM_FEATURE_AES
+            #  define __ARM_FEATURE_AES 1
+            #endif
+
 int
 main (void)
 {
- vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(__ARM_FEATURE_CRYPTO))
+
+            vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(0));
+
+            #ifdef __clang__
+            #  pragma clang attribute pop
+            #endif
+            (void) 0
+
   ;
   return 0;
 }
@@ -21164,10 +21204,10 @@ then :
 
 fi
 
-  ac_fn_c_check_func "$LINENO" "getauxva" "ac_cv_func_getauxva"
-if test "x$ac_cv_func_getauxva" = xyes
+  ac_fn_c_check_func "$LINENO" "getauxval" "ac_cv_func_getauxval"
+if test "x$ac_cv_func_getauxval" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETAUXVA 1" >>confdefs.h
+  printf "%s\n" "#define HAVE_GETAUXVAL 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "elf_aux_info" "ac_cv_func_elf_aux_info"