diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fbb24b6504..6746250b83 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-13  Ken Werner  <ken.werner@de.ibm.com>
+
+	* python/python.c (gdbpy_solib_name): Remove the const qualifier of
+	the format strings to be compatible with Python 2.4.
+
 2010-08-13  Vladimir Prus  <vladimir@codesourcery.com>
 
 	Easier and more stubborn MI memory read commands.
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 030b142059..0f39120b18 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -388,10 +388,11 @@ gdbpy_solib_name (PyObject *self, PyObject *args)
   PyObject *str_obj;
 #ifdef PY_LONG_LONG
   unsigned PY_LONG_LONG pc;
-  const char *format = "K";
+  /* To be compatible with Python 2.4 the format strings are not const.  */
+  char *format = "K";
 #else
   unsigned long pc;
-  const char *format = "k";
+  char *format = "k";
 #endif
 
   if (!PyArg_ParseTuple (args, format, &pc))