diff --git a/src/terminal-options.c b/src/terminal-options.c
index 780d1082..e994892b 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -56,11 +56,13 @@ terminal_fprintf (FILE* fp,
         if (verbosity < verbosity_level)
                 return;
 
-        gs_free char *commented_format = format_as_comment (format);
+        /* Double const as a workaround for Clang; gnome-terminal bug 790318. */
+        const char * const commented_format = format_as_comment (format);
         va_list args;
         va_start(args, format);
         g_vfprintf(fp, commented_format, args);
         va_end(args);
+        g_free ((char *) commented_format);
 }
 
 #if GLIB_CHECK_VERSION (2, 50, 0)
