diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index be80332..e34661b 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -392,6 +392,16 @@
 #error "MBEDTLS_PLATFORM_SNPRINTF_ALT defined, but not all prerequisites"
 #endif
 
+#if defined(MBEDTLS_PLATFORM_TF_SNPRINTF) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_TF_SNPRINTF defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_TF_SNPRINTF) &&\
+    ( defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) ||\
+      defined(MBEDTLS_PLATFORM_STD_SNPRINTF) )
+#error "MBEDTLS_PLATFORM_TF_SNPRINTF and MBEDTLS_PLATFORM_SNPRINTF_ALT/MBEDTLS_PLATFORM_STD_SNPRINTF, cannot be defined simultaneously"
+#endif
+
 #if defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO) && !defined(MBEDTLS_PLATFORM_C)
 #error "MBEDTLS_PLATFORM_SNPRINTF_MACRO defined, but not all prerequisites"
 #endif
@@ -399,7 +409,7 @@
 #if defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO) &&\
     ( defined(MBEDTLS_PLATFORM_STD_SNPRINTF) ||\
         defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) )
-#error "MBEDTLS_PLATFORM_SNPRINTF_MACRO and MBEDTLS_PLATFORM_STD_SNPRINTF/MBEDTLS_PLATFORM_SNPRINTF_ALT cannot be defined simultaneously"
+#error "MBEDTLS_PLATFORM_SNPRINTF_MACRO and MBEDTLS_PLATFORM_STD_SNPRINTF/MBEDTLS_PLATFORM_SNPRINTF_ALT/MBEDTLS_PLATFORM_TF_SNPRINTF cannot be defined simultaneously"
 #endif
 
 #if defined(MBEDTLS_PLATFORM_STD_MEM_HDR) &&\
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 1c98558..6737816 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -195,6 +195,22 @@
 //#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
 
 /**
+ * \def MBEDTLS_PLATFORM_TF_SNPRINTF
+ *
+ * Uncomment to enable the reduced snprintf to be used for trusted firmware.
+ *
+ * \warning Only The following type specifiers are supported:
+ * %d or %i - signed decimal format
+ * %u - unsigned decimal format
+ * The print panics on all other formats specifiers.
+ *
+ * \warning MBEDTLS_PLATFORM_SNPRINTF_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_TF_SNPRINTF!
+ *
+ */
+//#define MBEDTLS_PLATFORM_TF_SNPRINTF
+
+/**
  * \def MBEDTLS_DEPRECATED_WARNING
  *
  * Mark deprecated functions so that they generate a warning if used.
diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h
index ed10775..8e8a27e 100644
--- a/include/mbedtls/platform.h
+++ b/include/mbedtls/platform.h
@@ -50,6 +50,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <stdarg.h>
 #if !defined(MBEDTLS_PLATFORM_STD_SNPRINTF)
 #if defined(_WIN32)
 #define MBEDTLS_PLATFORM_STD_SNPRINTF   mbedtls_platform_win32_snprintf /**< The default \c snprintf function to use.  */