diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index bbad0c4..bb39131 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -264,7 +264,9 @@
 #if defined(PSA_WANT_ALG_PBKDF2_HMAC)
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_PBKDF2_HMAC)
 #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1
+#if !defined(MBEDTLS_PSA_ACCEL_ALG_HMAC)
 #define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
+#endif /* !MBEDTLS_PSA_ACCEL_ALG_HMAC */
 #endif /* !MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */
 #endif /* PSA_WANT_ALG_PBKDF2_HMAC */
 
@@ -682,12 +684,12 @@
 #define PSA_WANT_ALG_HMAC 1
 #define PSA_WANT_KEY_TYPE_HMAC
 
-#if defined(MBEDTLS_PKCS5_C)
-#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
-#define PSA_WANT_ALG_HMAC 1
-#define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1
-#define PSA_WANT_ALG_PBKDF2_HMAC 1
-#endif /* MBEDTLS_PKCS5_C */
+// #if defined(MBEDTLS_PKCS5_C)
+// #define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
+// #define PSA_WANT_ALG_HMAC 1
+// #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1
+// #define PSA_WANT_ALG_PBKDF2_HMAC 1
+// #endif /* MBEDTLS_PKCS5_C */
 
 #if defined(MBEDTLS_MD_C)
 #define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF 1