diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 3c3d9ca2d6..0efee04545 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -2479,6 +2479,8 @@
 //#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
 //#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
 //#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined */
 //#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
 //#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
 /* Note: your snprintf must correclty zero-terminate the buffer! */
diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h
index 69a6afda4b..039cb587ae 100644
--- a/include/mbedtls/platform.h
+++ b/include/mbedtls/platform.h
@@ -234,11 +234,11 @@ int mbedtls_platform_set_exit( void (*exit_func)( int status ) );
 /*
  * The time_t datatype
  */
-#if defined(MBEDTLS_PLATFORM_TIME_T_MACRO)
-#define mbedtls_time_t MBEDTLS_PLATFORM_TIME_T_MACRO
+#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO)
+typedef MBEDTLS_PLATFORM_TIME_TYPE_MACRO mbedtls_time_t;
 #else
-#define mbedtls_time_t time_t
-#endif /* MBEDTLS_PLATFORM_TIME_T_MACRO */
+typedef time_t mbedtls_time_t;
+#endif /* MBEDTLS_PLATFORM_TIME_TYPE_MACRO */
 
 /*
  * The function pointers for time