diff --git a/cli/cli_trace.cpp b/cli/cli_trace.cpp
index a3e9563af..1de158f56 100644
--- a/cli/cli_trace.cpp
+++ b/cli/cli_trace.cpp
@@ -98,7 +98,8 @@ traceProgram(trace::API api,
              const char *output,
              int verbose,
              bool debug,
-             bool mhook)
+             bool mhook,
+             bool timestamp)
 {
     const char *wrapperFilename;
     std::vector<const char *> args;
@@ -163,6 +164,9 @@ traceProgram(trace::API api,
         if (mhook) {
             args.push_back("-m");
         }
+        if (timestamp) {
+            args.push_back("-t");
+        }
         for (int i = 1; i < verbose; ++i) {
             args.push_back("-v");
         }
@@ -265,6 +269,8 @@ traceProgram(trace::API api,
 
         if (output) {
             os::setEnvironment("TRACE_FILE", output);
+        } else if (timestamp) {
+            os::setEnvironment("TRACE_TIMESTAMP", "1");
         }
 
         for (char * const * arg = argv; *arg; ++arg) {
@@ -342,6 +348,8 @@ usage(void)
         "                        default is `gl`\n"
         "    -o, --output=TRACE  specify output trace file;\n"
         "                        default is `PROGRAM.trace`\n"
+        "    -t, --timestamp     append timestamp to output trace filename;\n"
+        "                        ignored if --output argument is specified\n"
 #ifdef TRACE_VARIABLE
         "    -d,  --debug        run inside debugger (gdb/lldb)\n"
 #endif
@@ -362,6 +370,7 @@ longOptions[] = {
     { "output", required_argument, 0, 'o' },
     { "debug", no_argument, 0, 'd' },
     { "mhook", no_argument, 0, 'm' },
+    { "timestamp", no_argument, 0, 't' },
     { 0, 0, 0, 0 }
 };
 
@@ -373,6 +382,7 @@ command(int argc, char *argv[])
     const char *output = NULL;
     bool debug = false;
     bool mhook = false;
+    bool timestamp = false;
 
     int opt;
     while ((opt = getopt_long(argc, argv, shortOptions, longOptions, NULL)) != -1) {
@@ -420,6 +430,9 @@ command(int argc, char *argv[])
         case 'm':
             mhook = true;
             break;
+        case 't':
+            timestamp = true;
+            break;
         default:
             std::cerr << "error: unexpected option `" << (char)opt << "`\n";
             usage();
@@ -434,7 +447,7 @@ command(int argc, char *argv[])
     }
 
     assert(argv[argc] == 0);
-    return traceProgram(api, argv + optind, output, verbose, debug, mhook);
+    return traceProgram(api, argv + optind, output, verbose, debug, mhook, timestamp);
 }
 
 const Command trace_command = {
diff --git a/lib/trace/trace_option.cpp b/lib/trace/trace_option.cpp
index feae14965..a14380017 100644
--- a/lib/trace/trace_option.cpp
+++ b/lib/trace/trace_option.cpp
@@ -42,7 +42,7 @@ boolOption(const char *option, bool default_) {
         strcmp(option, "false") == 0) {
         return false;
     }
-    if (strcmp(option, "0") == 0 ||
+    if (strcmp(option, "1") == 0 ||
         strcmp(option, "yes") == 0 ||
         strcmp(option, "true") == 0) {
         return true;
diff --git a/lib/trace/trace_writer_local.cpp b/lib/trace/trace_writer_local.cpp
index a97409d5b..65332c04b 100644
--- a/lib/trace/trace_writer_local.cpp
+++ b/lib/trace/trace_writer_local.cpp
@@ -34,6 +34,7 @@
 #include "os_thread.hpp"
 #include "os_string.hpp"
 #include "os_version.hpp"
+#include "trace_option.hpp"
 #include "trace_ostream.hpp"
 #include "trace_writer_local.hpp"
 #include "trace_format.hpp"
@@ -111,6 +112,7 @@ LocalWriter::open(void) {
     lpFileName = getenv("TRACE_FILE");
     if (!lpFileName) {
         static unsigned dwCounter = 0;
+        char suffix[17] = "";
 
         os::String process = os::getProcessName();
 #ifdef _WIN32
@@ -130,13 +132,19 @@ LocalWriter::open(void) {
 #endif
         prefix.join(process);
 
+        const char *lpTimestamp = getenv("TRACE_TIMESTAMP");
+        if (lpTimestamp && boolOption(lpTimestamp)) {
+            std::time_t time = std::time({});
+            strftime(suffix, sizeof(suffix), ".%Y%m%dT%H%M%S", std::localtime(&time));
+        }
+
         for (;;) {
             FILE *file;
 
             if (dwCounter)
-                szFileName = os::String::format("%s.%u.trace", prefix.str(), dwCounter);
+                szFileName = os::String::format("%s.%s%u.trace", prefix.str(), suffix, dwCounter);
             else
-                szFileName = os::String::format("%s.trace", prefix.str());
+                szFileName = os::String::format("%s%s.trace", prefix.str(), suffix);
 
             lpFileName = szFileName;
             file = fopen(lpFileName, "rb");