diff --git a/programs/ssl/query_config.c b/programs/ssl/query_config.c
index 774acdf0a..8ef5d3739 100644
--- a/programs/ssl/query_config.c
+++ b/programs/ssl/query_config.c
@@ -1,5 +1,5 @@
 /*
- *  Query configuration information
+ *  Query Mbed TLS compile time configurations from config.h
  *
  *  Copyright (C) 2018, Arm Limited, All Rights Reserved
  *  SPDX-License-Identifier: Apache-2.0
@@ -32,7 +32,10 @@
 #define mbedtls_printf printf
 #endif /* MBEDTLS_PLATFORM_C */
 
-/* Include all the headers with public APIs in case they modify any configs */
+/*
+ * Include all the headers with public APIs in case they define a macro to its
+ * default value when that configuration is not set in the config.h.
+ */
 #include "mbedtls/aes.h"
 #include "mbedtls/aesni.h"
 #include "mbedtls/arc4.h"
@@ -2461,5 +2464,6 @@ int query_config( const char *config )
     }
 #endif /* MBEDTLS_PLATFORM_GMTIME_R_ALT */
 
+    /* If the symbol is not found, return an error */
     return( 1 );
 }
diff --git a/scripts/data_files/query_config.fmt b/scripts/data_files/query_config.fmt
index 3d62ebe9c..ef57a7c6f 100644
--- a/scripts/data_files/query_config.fmt
+++ b/scripts/data_files/query_config.fmt
@@ -1,5 +1,5 @@
 /*
- *  Query configuration information
+ *  Query Mbed TLS compile time configurations from config.h
  *
  *  Copyright (C) 2018, Arm Limited, All Rights Reserved
  *  SPDX-License-Identifier: Apache-2.0
@@ -32,7 +32,10 @@
 #define mbedtls_printf printf
 #endif /* MBEDTLS_PLATFORM_C */
 
-/* Include all the headers with public APIs in case they modify any configs */
+/*
+ * Include all the headers with public APIs in case they define a macro to its
+ * default value when that configuration is not set in the config.h.
+ */
 #include "mbedtls/aes.h"
 #include "mbedtls/aesni.h"
 #include "mbedtls/arc4.h"
@@ -109,5 +112,6 @@
 
 int query_config( const char *config )
 {
-CHECK_CONFIG    return( 1 );
+CHECK_CONFIG    /* If the symbol is not found, return an error */
+    return( 1 );
 }