diff --git a/library/version_features.c b/library/version_features.c
index 24143d052..7dbe10796 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -612,6 +612,9 @@ static const char *features[] = {
 #if defined(MBEDTLS_ECP_C)
     "MBEDTLS_ECP_C",
 #endif /* MBEDTLS_ECP_C */
+#if defined(MBEDTLS_USE_UECC)
+    "MBEDTLS_USE_UECC",
+#endif /* MBEDTLS_USE_UECC */
 #if defined(MBEDTLS_ENTROPY_C)
     "MBEDTLS_ENTROPY_C",
 #endif /* MBEDTLS_ENTROPY_C */
diff --git a/programs/ssl/query_config.c b/programs/ssl/query_config.c
index 6e281977e..266216f0f 100644
--- a/programs/ssl/query_config.c
+++ b/programs/ssl/query_config.c
@@ -1674,6 +1674,14 @@ int query_config( const char *config )
     }
 #endif /* MBEDTLS_ECP_C */
 
+#if defined(MBEDTLS_USE_UECC)
+    if( strcmp( "MBEDTLS_USE_UECC", config ) == 0 )
+    {
+        MACRO_EXPANSION_TO_STR( MBEDTLS_USE_UECC );
+        return( 0 );
+    }
+#endif /* MBEDTLS_USE_UECC */
+
 #if defined(MBEDTLS_ENTROPY_C)
     if( strcmp( "MBEDTLS_ENTROPY_C", config ) == 0 )
     {