diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 8efe3c0ee38..67514730306 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,8 @@
+2006-11-13  Denis Pilat  <denis.pilat@st.com>
+
+	* terminal.c (_rl_get_screen_size): use wr and wc variable to store
+	window size.
+
 2006-10-21  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* callback.c: Include "xmalloc.h".
diff --git a/readline/terminal.c b/readline/terminal.c
index 21732a791bb..46b50e77e24 100644
--- a/readline/terminal.c
+++ b/readline/terminal.c
@@ -226,8 +226,8 @@ _rl_get_screen_size (tty, ignore_env)
       CONSOLE_SCREEN_BUFFER_INFO scr;
       if (GetConsoleScreenBufferInfo (hConOut, &scr))
 	{
-	  _rl_screenwidth = scr.dwSize.X;
-	  _rl_screenheight = scr.srWindow.Bottom - scr.srWindow.Top + 1;
+	  wc = scr.dwSize.X;
+	  wr = scr.srWindow.Bottom - scr.srWindow.Top + 1;
 	}
     }
 #endif