diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 645db3076b..0114466d1b 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-03  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* server.c (main): Relax numerical bases supported for the pid of
+	the --attach command line argument.
+
 2007-12-03  Pedro Alves  <pedro_alves@portugalmail.pt>
 
 	* win32-low.c (win32_attach): Call OpenProcess before
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 0261e6bdf3..b445faa5de 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -880,7 +880,7 @@ main (int argc, char *argv[])
     {
       if (argc == 4
 	  && argv[3][0] != '\0'
-	  && (pid = strtoul (argv[3], &arg_end, 10)) != 0
+	  && (pid = strtoul (argv[3], &arg_end, 0)) != 0
 	  && *arg_end == '\0')
 	{
 	  ;