diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a94987284de..6352a65e4fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for
+	change in cc-engine.el.
+
 2011-11-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* window.el (switch-to-buffer): Use `force-same-window' interactively.
@@ -136,7 +141,6 @@
 
 	* progmodes/cc-langs.el (c-defun-tactic): Move this variable to
 	cc-vars.el.
-	(c-nonlabel-token-2-key): New variable for change in cc-engine.el.
 
 	* progmodes/cc-engine.el (c-beginning-of-statement-1):
 	Prevent "class foo : bar" being spuriously recognized as a label.
diff --git a/src/ChangeLog b/src/ChangeLog
index 67f8507a26b..cc3391cfee5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* w32fns.c (unwind_create_frame): If needed, free the glyph
 	matrices of the partially constructed frame.  (Bug#9943)
+	* xfns.c (unwind_create_frame): Likewise.
 
 2011-11-01  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/xfns.c b/src/xfns.c
index 913cde75d91..ac030582ffe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2936,6 +2936,7 @@ unwind_create_frame (Lisp_Object frame)
 #endif
 
       x_free_frame_resources (f);
+      free_glyphs (f);
 
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */