diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 769187fad9b..52b471b12e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-08  Pedro Alves  <palves@redhat.com>
+
+	* arm-tdep.c (_initialize_arm_tdep): Use ui_file_as_string and
+	std::string.
+
 2016-11-08  Pedro Alves  <palves@redhat.com>
 
 	* utils.c (error_stream): Use ui_file_as_string and std::string.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 31d33c161c9..78fc2643bd4 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -9584,7 +9584,7 @@ _initialize_arm_tdep (void)
   const char *setdesc;
   const char *const *regnames;
   int i;
-  static char *helptext;
+  static std::string helptext;
   char regdesc[1024], *rdptr = regdesc;
   size_t rest = sizeof (regdesc);
 
@@ -9655,14 +9655,14 @@ _initialize_arm_tdep (void)
 		      _("The valid values are:\n"),
 		      regdesc,
 		      _("The default is \"std\"."));
-  helptext = ui_file_xstrdup (stb, NULL);
+  helptext = ui_file_as_string (stb);
   ui_file_delete (stb);
 
   add_setshow_enum_cmd("disassembler", no_class,
 		       valid_disassembly_styles, &disassembly_style,
 		       _("Set the disassembly style."),
 		       _("Show the disassembly style."),
-		       helptext,
+		       helptext.c_str (),
 		       set_disassembly_style_sfunc,
 		       NULL, /* FIXME: i18n: The disassembly style is
 				\"%s\".  */