diff --git a/ChangeLog b/ChangeLog
index 9a57b05e3e6..db0d328337c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* configure.in: Test for XkbGetKeyboard with an AC_TRY_LINK whose
+	source file includes XKBlib.h.  On some broken Solaris systems,
+	there is an XKBlib.h, reportedly, but header files included by
+	XKBlib.h are missing.
+
 2000-12-14  Gerd Moellmann  <gerd@gnu.org>
 
 	* configure.in: AC_CHECK_FUNC XkbGetKeyboard.
diff --git a/src/ChangeLog b/src/ChangeLog
index 089aebbeb9f..b67fa850781 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* bytecode.c (toplevel) [CHECK_FRAME_FONT]: Include frame.h and
+	xterm.h.
+	(Fbyte_code) [CHECK_FRAME_FONT]: Check the selected frame's font.
+
 2000-12-18  Andrew Innes  <andrewi@gnu.org>
 
 	* w32.c (w32_strerror): New function.