diff --git a/Src/Metrics/Utils/AppEnvironment.cs b/Src/Metrics/Utils/AppEnvironment.cs
index 872431c9..a7e83373 100644
--- a/Src/Metrics/Utils/AppEnvironment.cs
+++ b/Src/Metrics/Utils/AppEnvironment.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
+using System.Reflection;
 using Metrics.MetricData;
 using Metrics.Logging;
 
@@ -27,6 +28,9 @@ public static IEnumerable<EnvironmentEntry> Current
                 yield return new EnvironmentEntry("HostName", SafeGetString(Dns.GetHostName));
                 yield return new EnvironmentEntry("IPAddress", SafeGetString(GetIpAddress));
                 yield return new EnvironmentEntry("LocalTime", Clock.FormatTimestamp(DateTime.Now));
+                var entryAssemblyName = Assembly.GetEntryAssembly().GetName();
+                yield return new EnvironmentEntry("EntryAssemblyName", entryAssemblyName.Name);
+                yield return new EnvironmentEntry("EntryAssemblyVersion", entryAssemblyName.Version.ToString());
             }
         }