diff --git a/package/libs/mbedtls/Config.in b/package/libs/mbedtls/Config.in
index 2920a5915b..92d7180f56 100644
--- a/package/libs/mbedtls/Config.in
+++ b/package/libs/mbedtls/Config.in
@@ -140,6 +140,11 @@ config MBEDTLS_ECP_DP_CURVE448_ENABLED
 
 comment "Build Options - unselect features to reduce binary size"
 
+config MBEDTLS_ARMV8CE_AES_C
+	bool "MBEDTLS_ARMV8CE_AES_C"
+	default y
+	depends on aarch64 && !TARGET_bcm27xx
+
 config MBEDTLS_CERTS_C
 	bool "MBEDTLS_CERTS_C"
 	default n
@@ -156,11 +161,6 @@ config MBEDTLS_DEBUG_C
 	bool "MBEDTLS_DEBUG_C"
 	default n
 
-config MBEDTLS_HAVE_ARMV8CE_AES
-	bool "MBEDTLS_HAVE_ARMV8CE_AES"
-	default y
-	depends on aarch64 && !TARGET_bcm27xx
-
 config MBEDTLS_HAVE_SSE2
 	bool "MBEDTLS_HAVE_SSE2"
 	default y
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index b64223b16e..53e6151cbc 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -60,12 +60,12 @@ MBEDTLS_BUILD_OPTS_CIPHERS= \
 MBEDTLS_BUILD_OPTS= \
   $(MBEDTLS_BUILD_OPTS_CURVES) \
   $(MBEDTLS_BUILD_OPTS_CIPHERS) \
+  CONFIG_MBEDTLS_ARMV8CE_AES_C \
   CONFIG_MBEDTLS_CERTS_C \
   CONFIG_MBEDTLS_CIPHER_MODE_OFB \
   CONFIG_MBEDTLS_CIPHER_MODE_XTS \
   CONFIG_MBEDTLS_DEBUG_C \
   CONFIG_MBEDTLS_ENTROPY_FORCE_SHA256 \
-  CONFIG_MBEDTLS_HAVE_ARMV8CE_AES \
   CONFIG_MBEDTLS_HAVE_SSE2 \
   CONFIG_MBEDTLS_HKDF_C \
   CONFIG_MBEDTLS_PLATFORM_C \
@@ -126,7 +126,7 @@ endef
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
 TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS))
-ifneq ($(CONFIG_MBEDTLS_HAVE_ARMV8CE_AES),)
+ifneq ($(CONFIG_MBEDTLS_ARMV8CE_AES_C),)
   TARGET_CFLAGS := $(filter-out -march=%,$(TARGET_CFLAGS)) -march=armv8-a+crypto
 endif
 
diff --git a/package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch b/package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch
index 14c0b9ea43..07f18f89ab 100644
--- a/package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch
+++ b/package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch
@@ -142,7 +142,7 @@ Then run normal make or cmake etc.
 + *
 + * This module adds support for Armv8 Cryptography Extensions for AES and GCM.
 + */
-+#define MBEDTLS_ARMV8CE_AES_C
++//#define MBEDTLS_ARMV8CE_AES_C
 +
 +/**
   * \def MBEDTLS_AES_C