diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8abff1fe094..157b82dc452 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-28  Tom Tromey  <tromey@redhat.com>
+
+	* python/python-internal.h (PY_SSIZE_T_CLEAN): Define.
+
 2011-06-27  Tom Tromey  <tromey@redhat.com>
 
 	* valops.c (find_overload_match): Call do_cleanups before early
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index b65109d13bd..996b23b0c9b 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -41,6 +41,9 @@
    around technique as above.  */
 #undef _FILE_OFFSET_BITS
 
+/* Request clean size types from Python.  */
+#define PY_SSIZE_T_CLEAN
+
 /* Include the Python header files using angle brackets rather than
    double quotes.  On case-insensitive filesystems, this prevents us
    from including our python/python.h header file.  */