diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e0b47b4bb0..29b525ae38 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-12  Joel Brobecker  <brobecker@adacore.com>
+
+	* ada-lang.c (_initialize_ada_language): Expand the help text
+	for the "catch exception" command.
+
 2019-01-12  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
 	* symtab.c (matching_obj_sections): Initialize obj,
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f552f13a41..dbd258a608 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -14508,7 +14508,14 @@ overloads selection menu is activated"),
 
   add_catch_command ("exception", _("\
 Catch Ada exceptions, when raised.\n\
-With an argument, catch only exceptions with the given name."),
+Usage: catch exception [ ARG ]\n\
+\n\
+Without any argument, stop when any Ada exception is raised.\n\
+If ARG is \"unhandled\" (without the quotes), only stop when the exception\n\
+being raised does not have a handler (and will therefore lead to the task's\n\
+termination).\n\
+Otherwise, the catchpoint only stops when the name of the exception being\n\
+raised is the same as ARG."),
 		     catch_ada_exception_command,
                      NULL,
 		     CATCH_PERMANENT,