diff --git a/src/ChangeLog b/src/ChangeLog
index a5aee6ad56c..8c64defd5db 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-28  Masatake YAMATO  <jet@gyve.org>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Change the
+	pointer to a hand cursor when hoovering over a mouse-face.
+
 2005-05-27  Kenichi Handa  <handa@m17n.org>
 
 	* xterm.c (x_encode_char): Call check_ccl_update in advance.
diff --git a/src/xdisp.c b/src/xdisp.c
index 53d881072ce..b20c4815abc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21443,6 +21443,9 @@ note_mode_line_or_margin_highlight (window, x, y, area)
 								 0, 0, 0, &ignore,
 								 glyph->face_id, 1);
 	  show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+
+	  if (NILP (pointer))
+	    pointer = Qhand;
 	}
     }