diff --git a/include/ChangeLog b/include/ChangeLog
index 26380502a3..c351066097 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-06  H.J. Lu <hongjiu.lu@intel.com>
+
+	* demangle.h: Support C++.
+
 2003-07-01  Zack Weinberg  <zack@codesourcery.com>
 
 	* filenames.h: New file imported from binutils.
diff --git a/include/demangle.h b/include/demangle.h
index 21e9dd3382..bff266931c 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -23,6 +23,10 @@
 
 #include "ansidecl.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* Options passed to cplus_demangle (in 2nd parameter). */
 
 #define DMGL_NO_OPTS	 0		/* For readability... */
@@ -160,4 +164,8 @@ enum gnu_v3_dtor_kinds {
 extern enum gnu_v3_dtor_kinds
 	is_gnu_v3_mangled_dtor PARAMS ((const char *name));
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif	/* DEMANGLE_H */