diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6af69972297..5a811b8cb8f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 15 12:07:55 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* printcmd.c (print_frame_args), stack.c (print_frame), command.c
+ 	(do_setshow_command), breakpoint.c (print_it_typical, mention):
+ 	Use make_cleanup_ui_out_stream_delete.
+
 Mon May 15 11:23:23 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* proc-events.c (init_syscall_table): Delete stray ``;''.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 89b15909a71..98bd2367a88 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1939,7 +1939,7 @@ print_it_typical (bs)
   struct cleanup *old_chain;
   struct ui_stream *stb;
   stb = ui_out_stream_new (uiout);
-  old_chain = make_cleanup ((make_cleanup_func) ui_out_stream_delete, stb);
+  old_chain = make_cleanup_ui_out_stream_delete (stb);
 #endif /* UI_OUT */
   /* bs->breakpoint_at can be NULL if it was a momentary breakpoint
      which has since been deleted.  */
@@ -4458,7 +4458,7 @@ mention (b)
   struct ui_stream *stb;
 
   stb = ui_out_stream_new (uiout);
-  old_chain = make_cleanup ((make_cleanup_func) ui_out_stream_delete, stb);
+  old_chain = make_cleanup_ui_out_stream_delete (stb);
 #endif /* UI_OUT */
 
   /* FIXME: This is misplaced; mention() is called by things (like hitting a
diff --git a/gdb/command.c b/gdb/command.c
index 43f2a7e7384..d753d77fef3 100644
--- a/gdb/command.c
+++ b/gdb/command.c
@@ -1723,7 +1723,7 @@ do_setshow_command (arg, from_tty, c)
       int quote;
 
       stb = ui_out_stream_new (uiout);
-      old_chain = make_cleanup ((make_cleanup_func) ui_out_stream_delete, stb);
+      old_chain = make_cleanup_ui_out_stream_delete (stb);
 #endif /* UI_OUT */
 
       /* Print doc minus "show" at start.  */
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 85571ab305e..d9c3b2469e7 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1852,7 +1852,7 @@ print_frame_args (func, fi, num, stream)
   struct ui_stream *stb;
 
   stb = ui_out_stream_new (uiout);
-  old_chain = make_cleanup (ui_out_stream_delete, stb);
+  old_chain = make_cleanup_ui_out_stream_delete (stb);
 #endif /* UI_OUT */
 
   if (func)
diff --git a/gdb/stack.c b/gdb/stack.c
index 8684b7b7b9c..afa6041d79c 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -471,7 +471,7 @@ print_frame (struct frame_info *fi,
   struct cleanup *old_chain;
 
   stb = ui_out_stream_new (uiout);
-  old_chain = make_cleanup ((make_cleanup_func) ui_out_stream_delete, stb);
+  old_chain = make_cleanup_ui_out_stream_delete (stb);
 #endif /* UI_OUT */
 
   func = find_pc_function (fi->pc);