diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 37aa860472..e605a5daa7 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -13,6 +13,12 @@ namespace MediaBrowser.Model.System
         /// <value>The version.</value>
         public string Version { get; set; }
 
+        /// <summary>
+        /// Gets or sets the mac address.
+        /// </summary>
+        /// <value>The mac address.</value>
+        public string MacAddress { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance has pending restart.
         /// </summary>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 3d640190c1..2e3037b714 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -582,10 +582,28 @@ namespace MediaBrowser.ServerApplication
                 InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToArray(),
                 CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
                 Id = _systemId,
-                ProgramDataPath = ApplicationPaths.ProgramDataPath
+                ProgramDataPath = ApplicationPaths.ProgramDataPath,
+                MacAddress = GetMacAddress()
             };
         }
 
+        /// <summary>
+        /// Gets the mac address.
+        /// </summary>
+        /// <returns>System.String.</returns>
+        private string GetMacAddress()
+        {
+            try
+            {
+                return NetworkManager.GetMacAddress();
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error getting mac address", ex);
+                return null;
+            }
+        }
+
         /// <summary>
         /// Shuts down.
         /// </summary>