diff --git a/include/ChangeLog b/include/ChangeLog
index 7e1bf2049..8b5630d02 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-24  Ian Lance Taylor  <iant@google.com>
+
+	* md5.h: Add extern "C" when compiled with C++.
+
 2008-03-21  Ian Lance Taylor  <iant@google.com>
 
 	* filenames.h: Add extern "C" when compiled with C++.
diff --git a/include/md5.h b/include/md5.h
index e8eedb96d..c8602ee14 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -21,6 +21,10 @@
 #ifndef _MD5_H
 #define _MD5_H 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 
 #if defined HAVE_LIMITS_H || _LIBC
@@ -138,4 +142,8 @@ extern int md5_stream (FILE *stream, void *resblock);
    digest.  */
 extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif