3 files changed, 29 insertions, 2 deletions
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index f17fd7159..e4fd970e0 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -17,7 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
+    <Compile Include="..\Jellyfin.Versioning\SharedVersion.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Jellyfin.Versioning\Jellyfin.Versioning.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index bc8983fd1..eded5248e 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -1,3 +1,5 @@
+using Jellyfin.Versioning;
+
 namespace MediaBrowser.Model.System
 {
     public class PublicSystemInfo
@@ -21,12 +23,24 @@ namespace MediaBrowser.Model.System
         public string ServerName { get; set; }
 
         /// <summary>
-        /// Gets or sets the version.
+        /// Gets or sets the API version.
         /// </summary>
         /// <value>The version.</value>
         public string Version { get; set; }
 
         /// <summary>
+        /// Gets or sets the server version.
+        /// </summary>
+        /// <value>The server version.</value>
+        public string ServerVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the build version.
+        /// </summary>
+        /// <value>The build version.</value>
+        public ExtendedVersion ExtendedVersion { get; set; }
+
+        /// <summary>
         /// Gets or sets the operating sytem.
         /// </summary>
         /// <value>The operating sytem.</value>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index b0432ae74..26f735330 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -16,6 +16,15 @@ namespace MediaBrowser.Model.System
         /// <value>The display name of the operating system.</value>
         public string OperatingSystemDisplayName { get; set; }
 
+        /// <summary>
+        /// The product name. This is the AssemblyProduct name.
+        /// </summary>
+        public string ProductName { get; set; }
+
+        /// <summary>
+        /// Get or sets the package name.
+        /// </summary>
+        /// <value>The value of the '-package' command line argument.</value>
         public string PackageName { get; set; }
 
         /// <summary>