diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index a8f22c9bde6..73b52253f5a 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -27,6 +27,7 @@
 #include "cli/cli-decode.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-setshow.h"
+#include "cli/cli-style.h"
 #include "cli/cli-utils.h"
 
 /* Return true if the change of command parameter should be notified.  */
@@ -137,12 +138,16 @@ deprecated_show_value_hack (struct ui_file *ignore_file,
     {
     case var_string:
     case var_string_noescape:
-    case var_optional_filename:
-    case var_filename:
     case var_enum:
       gdb_printf ((" is \"%s\".\n"), value);
       break;
 
+    case var_optional_filename:
+    case var_filename:
+      gdb_printf ((" is \"%ps\".\n"),
+		  styled_string (file_name_style.style (), value));
+      break;
+
     default:
       gdb_printf ((" is %s.\n"), value);
       break;
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 3ee8a751f3b..1d35e4d4ac9 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -35,6 +35,7 @@
 #include <algorithm>
 #include "completer.h"
 #include "readline/tilde.h"
+#include "cli/cli-style.h"
 
 /* Types.  */
 
@@ -1230,8 +1231,8 @@ show_tdesc_filename_cmd (struct ui_file *file, int from_tty,
 
   if (value != NULL && *value != '\0')
     gdb_printf (file,
-		_("The target description will be read from \"%s\".\n"),
-		value);
+		_("The target description will be read from \"%ps\".\n"),
+		styled_string (file_name_style.style (), value));
   else
     gdb_printf (file,
 		_("The target description will be "