diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5cec8d53d6..bac875cd67 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-17  Tom Tromey  <tromey@redhat.com>
+
+	* remote.c (extended_remote_run): Use make_cleanup_freeargv.
+
 2014-06-16  Keith Seitz  <keiths@redhat.com>
 
 	PR mi/15863
diff --git a/gdb/remote.c b/gdb/remote.c
index 909e9dd8be..6915dd8d04 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -7888,7 +7888,7 @@ extended_remote_run (char *args)
       char **argv;
 
       argv = gdb_buildargv (args);
-      back_to = make_cleanup ((void (*) (void *)) freeargv, argv);
+      back_to = make_cleanup_freeargv (argv);
       for (i = 0; argv[i] != NULL; i++)
 	{
 	  if (strlen (argv[i]) * 2 + 1 + len >= get_remote_packet_size ())