diff --git a/mac/ChangeLog b/mac/ChangeLog
index 17fe8e84cef..5ce1044bc23 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* INSTALL: Add note about moving self-contained application bundle
+	to non-ASCII directory.
+
 2007-04-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* INSTALL: Fix description about using colors in terminal.
diff --git a/mac/INSTALL b/mac/INSTALL
index 30dc539afab..302317b025f 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -153,6 +153,11 @@ options to user
 
 For usage of other options, use the --help option.
 
+Note: due to the problem "Installing to a directory with non-ASCII
+characters in the name fails" mentioned in etc/PROBLEMS, you may not
+move a self-contained Emacs.app application bundle to a non-ASCII
+directory.
+
 * BUILDING EMACS ON MAC OS Classic
 
 You can use MPW-GM (Aug. 2001) to build Emacs.  MPW-GM can be
diff --git a/src/ChangeLog b/src/ChangeLog
index 72b69938002..9782c83c2e5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
+	Call mac_wakeup_from_rne on window size change.
+
 2007-05-25  Chong Yidong  <cyd@stupidchicken.com>
 
 	* image.c (uncache_image): Fix typo.
diff --git a/src/macterm.c b/src/macterm.c
index 9c1a151f4a9..91522eeda7a 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9893,6 +9893,7 @@ mac_handle_window_event (next_handler, event, data)
 	      width = bounds.right - bounds.left;
 	      height = bounds.bottom - bounds.top;
 	      mac_handle_size_change (f, width, height);
+	      mac_wakeup_from_rne ();
 	    }
 	}