diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 42efc5c3b..1ee070770 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,9 @@
+1997-11-26  Anthony Green  <green@hoser.cygnus.com>
+
+	* gh_data.c (gh_set_substr): Strings can be longer than 256 bytes.
+
+	* gh.h: Safely wrap prototypes for c++ usage.
+
 1997-11-25  Mark Galassi  <rosalia@cygnus.com>
 
 	* gh_test_repl.c (main_prog): changed invocation of gh_repl() to
diff --git a/libguile/gh.h b/libguile/gh.h
index 386353bac..5a6485f88 100644
--- a/libguile/gh.h
+++ b/libguile/gh.h
@@ -43,6 +43,10 @@
 #ifndef __GH_H
 #define __GH_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 
 #include <libguile.h>
@@ -226,5 +230,8 @@ void gh_newline (void);
 
 /* void  gh_assert(int cond, char *msg, SCM obj); */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __GH_H */