diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4f89370a81..f2a365a2d2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* utils.c (set_screen_size): Use INT_MAX for default columns.
+
 2007-06-13  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* remote.c (remote_protocol_features): Add qXfer:spu:read and
diff --git a/gdb/utils.c b/gdb/utils.c
index e1fb9ed48c..6f3719adc6 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1633,7 +1633,7 @@ set_screen_size (void)
     rows = INT_MAX;
 
   if (cols <= 0)
-    rl_get_screen_size (NULL, &cols);
+    cols = INT_MAX;
 
   /* Update Readline's idea of the terminal size.  */
   rl_set_screen_size (rows, cols);