diff --git a/ChangeLog b/ChangeLog
index a3171d7..cd7fc41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.xx branch released xxxx-xx-xx
+
+Bugfix
+    * Include configuration file in md.h, to fix compilation warnings.
+      Reported by aaronmdjones in #1001
+
 = mbed TLS 1.3.21 branch released 2017-08-10
 
 Security
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index fc7482a..e395870 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -33,6 +33,12 @@
 #define inline __inline
 #endif
 
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
 #define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE                -0x5080  /**< The selected feature is not available. */
 #define POLARSSL_ERR_MD_BAD_INPUT_DATA                     -0x5100  /**< Bad input parameters to function. */
 #define POLARSSL_ERR_MD_ALLOC_FAILED                       -0x5180  /**< Failed to allocate memory. */