diff --git a/ChangeLog b/ChangeLog
index 77e99e328..e7d4f9627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ Bugfix
      If a call to one of the functions of the cryptographic primitive modules
      failed, the error may not be noticed by the function 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 1.3.21 branch released 2017-08-10
 
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index fc7482a4b..9be55a989 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -27,6 +27,11 @@
 #define POLARSSL_MD_H
 
 #include <stddef.h>
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
     !defined(inline) && !defined(__cplusplus)