diff --git a/src/ChangeLog b/src/ChangeLog
index 19db11870fe..dbdd1515605 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
 	* window.c (Fset_window_buffer): Set WINDOW to the window
 	after decoding.
+	(coordinates_in_window): Take frame's internal border width
+	into account.
 
 2000-02-24  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/src/window.c b/src/window.c
index bdc0c6c1bc0..be6bf813920 100644
--- a/src/window.c
+++ b/src/window.c
@@ -464,9 +464,11 @@ coordinates_in_window (w, x, y)
     }
   else
     {
-      left_x = WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w);
+      left_x = (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w)
+		- FRAME_INTERNAL_BORDER_WIDTH (f));
       right_x = WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X (w);
-      top_y = WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w);
+      top_y = (WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w)
+	       - FRAME_INTERNAL_BORDER_WIDTH (f));
       bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w);
     }