diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 76f0d3c9b5..5d0b3f6067 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -398,6 +398,12 @@ char *CrashLog::FillCrashLog(char *buffer, const char *last) const
 	}
 #endif
 
+	if (IsNonMainThread()) {
+		buffer += seprintf(buffer, last, "Non-main thread (");
+		buffer += GetThreadName(buffer, last);
+		buffer += seprintf(buffer, last, ")\n\n");
+	}
+
 	buffer = this->LogOpenTTDVersion(buffer, last);
 	buffer = this->LogStacktrace(buffer, last);
 	buffer = this->LogRegisters(buffer, last);