diff --git a/ChangeLog.d/issue4036.txt b/ChangeLog.d/issue4036.txt
new file mode 100644
index 000000000..9b348d330
--- /dev/null
+++ b/ChangeLog.d/issue4036.txt
@@ -0,0 +1,5 @@
+Default behavior changes
+   * Enable by default the functionalities which have no reason to be disabled.
+     They are: ARIA block cipher, CMAC mode, elliptic curve J-PAKE library and 
+     Key Wrapping mode as defined in NIST SP 800-38F. Fixes #4036.
+
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index c34b6ba47..623b59385 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -2718,7 +2718,7 @@
  *
  * \warning This is currently experimental. EC J-PAKE support is based on the
  * Thread v1.0.0 specification; incompatible changes to the specification
- * might still happen. For this reason, this is disabled by default.
+ * might still happen.
  *
  * Module:  library/ecjpake.c
  * Caller: