diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index ee8c7a4f9abf81cd7269addc8aa9390905bdf0b4..78922bd767988a1afe45aa5f3bb898ac70e06b38 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1648,6 +1648,7 @@ bash ${top_srcdir_abs_path}/configure \
     --with-debug-level=$debugbuild \
     --enable-unlimited-crypto \
     --with-zlib=system \
+    --enable-kae=yes \
     --with-stdc++lib=dynamic \
     --with-extra-cflags="$EXTRA_CFLAGS" \
     --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
diff --git a/kae-phase1.patch b/kae-phase1.patch
index bc0f6efd096cdc8f5f4009b46387d943d6c3e356..cf57560e79734efd17adad7eae7a57ecea85f614 100644
--- a/kae-phase1.patch
+++ b/kae-phase1.patch
@@ -94,11 +94,11 @@ index d754f1d6..ea43a7a0 100644
    --enable-unlimited-crypto
                            Enable unlimited crypto policy [disabled]
    --disable-jfr           Disable Java Flight Recorder support [enabled]
-+  --disable-kae           Disable KAE support on aarch64 [enabled]
++  --enable-kae            Enable KAE support on aarch64 [disabled]
    --disable-debug-symbols disable generation of debug symbols [enabled]
    --disable-zip-debug-info
                            disable zipping of debug-info files [enabled]
-@@ -19843,6 +19846,31 @@ fi
+@@ -19843,6 +19846,27 @@ fi
  $as_echo "$ENABLE_JFR" >&6; }
  
  
@@ -112,12 +112,8 @@ index d754f1d6..ea43a7a0 100644
 +if test "${enable_kae+set}" = set; then :
 +  enableval=$enable_kae; enable_kae="${enableval}"
 +else
-+  #default enable on aarch64
-+  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-+    enable_kae="yes"
-+  else
-+    enable_kae="no"
-+  fi
++  #default disable kae
++  enable_kae="no"
 +fi
 +
 +  if test "x$enable_kae" = "xyes"; then
@@ -143,8 +139,8 @@ index e4eb2352..23db9275 100644
 +  #
 +  # Enable or disable kae
 +  #
-+  AC_ARG_ENABLE(kae, [AS_HELP_STRING([--disable-kae],
-+      [disable KAE @<:@disabled@:>@])],,
++  AC_ARG_ENABLE(kae, [AS_HELP_STRING([--enable-kae],
++      [enable KAE @<:@enabled@:>@])],,
 +      [enable_kae=no])
 +  if test "x$enable_kae" = "xyes"; then
 +    ENABLE_KAE=true