diff --git a/configure b/configure
index afc6ab8ad..cf2e63275 100755
--- a/configure
+++ b/configure
@@ -14068,13 +14068,13 @@ printf "%s\n" "#define PNG_INTEL_SSE_OPT 0" >>confdefs.h
             arm*|aarch64*)
               enable_arm_neon=yes
 
-printf "%s\n" "#define PNG_ARM_NEON_OPT 0" >>confdefs.h
+printf "%s\n" "#define PNG_ARM_NEON_OPT 2" >>confdefs.h
 
               ;;
             mipsel*|mips64el*)
               enable_mips_msa=yes
 
-printf "%s\n" "#define PNG_MIPS_MSA_OPT 0" >>confdefs.h
+printf "%s\n" "#define PNG_MIPS_MSA_OPT 2" >>confdefs.h
 
               ;;
             i?86|x86_64)
diff --git a/configure.ac b/configure.ac
index ff4495156..f12da2672 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,12 +320,12 @@ AC_ARG_ENABLE([hardware-optimizations],
          case "$host_cpu" in
             arm*|aarch64*)
               enable_arm_neon=yes
-              AC_DEFINE([PNG_ARM_NEON_OPT], [0],
+              AC_DEFINE([PNG_ARM_NEON_OPT], [2],
                 [Enable ARM_NEON optimizations])
               ;;
             mipsel*|mips64el*)
               enable_mips_msa=yes
-              AC_DEFINE([PNG_MIPS_MSA_OPT], [0],
+              AC_DEFINE([PNG_MIPS_MSA_OPT], [2],
                 [Enable MIPS_MSA optimizations])
               ;;
             i?86|x86_64)