diff --git a/gdb-bz611569-gdbpy_is_string.patch b/gdb-bz611569-gdbpy_is_string.patch
new file mode 100644
index 0000000..5d68ed0
--- /dev/null
+++ b/gdb-bz611569-gdbpy_is_string.patch
@@ -0,0 +1,33 @@
+FYI: fix buglet in gdbpy_get_display_hint
+http://sourceware.org/ml/gdb-patches/2010-07/msg00190.html
+http://sourceware.org/ml/gdb-cvs/2010-07/msg00061.html
+
+### src/gdb/ChangeLog	2010/07/09 02:39:57	1.11979
+### src/gdb/ChangeLog	2010/07/09 20:29:56	1.11980
+## -1,3 +1,8 @@
++2010-07-09  Tom Tromey  <tromey@redhat.com>
++
++	* python/py-prettyprint.c (gdbpy_get_display_hint): Don't use
++	'hint' if it is NULL.
++
+ 2010-07-09  Hui Zhu  <teawater@gmail.com>
+ 
+ 	* source.c (print_source_lines_base): Add check for noprint.
+--- src/gdb/python/py-prettyprint.c	2010/06/11 15:36:09	1.12
++++ src/gdb/python/py-prettyprint.c	2010/07/09 20:29:56	1.13
+@@ -229,10 +229,12 @@
+     return NULL;
+ 
+   hint = PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst, NULL);
+-  if (gdbpy_is_string (hint))
+-    result = python_string_to_host_string (hint);
+   if (hint)
+-    Py_DECREF (hint);
++    {
++      if (gdbpy_is_string (hint))
++	result = python_string_to_host_string (hint);
++      Py_DECREF (hint);
++    }
+   else
+     gdbpy_print_stack ();
+ 
diff --git a/gdb.spec b/gdb.spec
index 2af47d6..a62d508 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -36,7 +36,7 @@ Version: 7.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 29%{?_with_upstream:.upstream}%{dist}
+Release: 30%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain
 Group: Development/Debuggers
@@ -533,6 +533,9 @@ Patch489: gdb-bz614659-prelink-dynbss.patch
 # [delayed-symfile] Fix a backtrace regression on CFIs without DIE (BZ 614604).
 Patch490: gdb-bz614604-bt-cfi-without-die.patch
 
+# Fix crash in gdbpy_is_string (BZ 611569, Tom Tromey).
+Patch492: gdb-bz611569-gdbpy_is_string.patch
+
 BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa}
 Requires: readline%{?_isa}
 BuildRequires: readline-devel%{?_isa}
@@ -837,6 +840,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch487 -p1
 %patch489 -p1
 %patch490 -p1
+%patch492 -p1
 
 %patch415 -p1
 %patch393 -p1
@@ -1169,6 +1173,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 22 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.1-30.fc13
+- Fix crash in gdbpy_is_string (BZ 611569, Tom Tromey).
+
 * Tue Jul 20 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.1-29.fc13
 - Fix prelinked executables with sepdebug and copy relocations (BZ 614659).
 - [delayed-symfile] Fix a backtrace regression on CFIs without DIE (BZ 614604).