diff --git a/include/ChangeLog b/include/ChangeLog
index bf06aba1498..36421318ddf 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-15  Doug Evans  <dje@transmeta.com>
+
+	* dis-asm.h: Enclose in extern "C" ifdef __cplusplus.
+
 Sun Oct 24 19:11:32 1999  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* sim-d10v.h (SIM_D10V_TS2_DMAP_REGNUM): Define.
diff --git a/include/dis-asm.h b/include/dis-asm.h
index de400796349..121b3983030 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -9,6 +9,10 @@
 #ifndef DIS_ASM_H
 #define DIS_ASM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include "bfd.h"
 
@@ -246,4 +250,8 @@ extern int generic_symbol_at_address
   (INFO).display_endian = BFD_ENDIAN_UNKNOWN, \
   (INFO).insn_info_valid = 0
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* ! defined (DIS_ASM_H) */