diff --git a/ChangeLog b/ChangeLog
index 6dcd136dd..973d18feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
-= mbed TLS 2.1.10 branch released 2017-xx-xx
+= mbed TLS 2.1.10 branch released xxxx-xx-xx
 
 Security
    * Fix a potential heap buffer overflow in mbedtls_ssl_write. When the (by
@@ -33,6 +33,8 @@ Bugfix
      failed, the error may not be noticed by the function
      mbedtls_pem_read_buffer() causing it to return invalid values. Found by
      Guido Vranken. #756
+   * Include configuration file in md.h, to fix compilation warnings.
+     Reported by aaronmdjones in #1001
 
 = mbed TLS 2.1.9 branch released 2017-08-10
 
diff --git a/include/mbedtls/md.h b/include/mbedtls/md.h
index b90235533..00b1e3a5e 100644
--- a/include/mbedtls/md.h
+++ b/include/mbedtls/md.h
@@ -27,6 +27,12 @@
 
 #include <stddef.h>
 
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
 #define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE                -0x5080  /**< The selected feature is not available. */
 #define MBEDTLS_ERR_MD_BAD_INPUT_DATA                     -0x5100  /**< Bad input parameters to function. */
 #define MBEDTLS_ERR_MD_ALLOC_FAILED                       -0x5180  /**< Failed to allocate memory. */