diff --git a/TShockAPI/Log.cs b/TShockAPI/Log.cs
index f573c684..8263356b 100644
--- a/TShockAPI/Log.cs
+++ b/TShockAPI/Log.cs
@@ -117,7 +117,17 @@ namespace TShockAPI
                 return;
             }
 
-            string caller = "TShock";
+            StackTrace trace = new StackTrace();
+            StackFrame frame = null;
+
+            frame = trace.GetFrame(2);
+
+            string caller = "TShock: ";
+
+            if (frame != null && frame.GetMethod().DeclaringType != null)
+            {
+                caller += frame.GetMethod().DeclaringType.Name + ": ";
+            }
 
             _logWriter.WriteLine(string.Format("{0} - {1}: {2}: {3}",
                                  DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture),