diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a1325c62ad..35f082f9ea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-23  Doug Evans  <dje@google.com>
+
+	* python/lib/gdb/printing.py (register_pretty_printer): Add missing
+	entry for RuntimeError to doc string.
+
 2011-05-23  Jerome Guitton  <guitton@adacore.com>
 
 	* sparc-tdep.c (sparc_skip_stack_check): Recognize a new instruction
diff --git a/gdb/python/lib/gdb/printing.py b/gdb/python/lib/gdb/printing.py
index ff24bb4e7a..5207659aaa 100644
--- a/gdb/python/lib/gdb/printing.py
+++ b/gdb/python/lib/gdb/printing.py
@@ -86,6 +86,7 @@ def register_pretty_printer(obj, printer):
     Raises:
         TypeError: A problem with the type of the printer.
         ValueError: The printer's name contains a semicolon ";".
+        RuntimeError: A printer with the same name is already registered.
 
     If the caller wants the printer to be listable and disableable, it must
     follow the PrettyPrinter API.  This applies to the old way (functions) too.