diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fafba552e..41bacc951 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Thomas Wolff  <towo@computer.org>
+
+	* fhandler_console.cc (read): Consider offset within scrolling
+	region of the console window.
+
 2004-12-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygheap.h (cwdstuff::get_drive): Release cwd_lock.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 76b79119b..242366fe5 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -421,10 +421,25 @@ fhandler_console::read (void *pv, size_t& buflen)
 	      if (mouse_event.dwEventFlags)
 		continue;
 
-	      /* If the mouse event occurred out of the area we can handle,
-		 ignore it. */
+	      /* Retrieve reported mouse position */
 	      int x = mouse_event.dwMousePosition.X;
 	      int y = mouse_event.dwMousePosition.Y;
+
+	      /* Adjust mouse position by scroll buffer offset */
+	      CONSOLE_SCREEN_BUFFER_INFO now;
+	      if (GetConsoleScreenBufferInfo (get_output_handle (), &now))
+		{
+		  y -= now.srWindow.Top;
+		  x -= now.srWindow.Left;
+		}
+	      else
+		{
+		  syscall_printf ("mouse: cannot adjust position by scroll buffer offset");
+		  continue;
+		}
+
+	      /* If the mouse event occurred out of the area we can handle,
+		 ignore it. */
 	      if ((x + ' ' + 1 > 0xFF) || (y + ' ' + 1 > 0xFF))
 		{
 		  syscall_printf ("mouse: position out of range");