diff --git a/src/corelib/CurrentApp.cs b/src/corelib/CurrentApp.cs
index 9944b3fc..f7b0bd66 100644
--- a/src/corelib/CurrentApp.cs
+++ b/src/corelib/CurrentApp.cs
@@ -212,7 +212,7 @@ public CurrentApp(bool IsPortable, string AppName)
             }
 
             // Generating User-Agent header for outgoing HTTP queries...
-            UserAgent = string.Format(Properties.Resources.AppUserAgentTemplate, Platform.OSFriendlyName, Platform.UserAgentSuffix, Environment.OSVersion.Version.Major, Environment.OSVersion.Version.Minor, CultureInfo.CurrentCulture.Name, AppVersion, AppName, SystemArch);
+            UserAgent = string.Format(Properties.Resources.AppUserAgentTemplate, Platform.OSFriendlyName, Platform.UserAgentSuffix, SystemVersion, SystemArch, CultureInfo.CurrentCulture.Name, AppName, AppVersion);
         }
     }
 }
diff --git a/src/corelib/Properties/Resources.Designer.cs b/src/corelib/Properties/Resources.Designer.cs
index 606d0327..9846c2e8 100644
--- a/src/corelib/Properties/Resources.Designer.cs
+++ b/src/corelib/Properties/Resources.Designer.cs
@@ -106,7 +106,7 @@ internal static string AppUserAgentSuffixWin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mozilla/5.0 ({0} {1} {2}.{3}; {4}; rv:{5}) {6} ({7}).
+        ///   Looks up a localized string similar to Mozilla/5.0 ({0} {1} {2}; {3}; {4}) {5}/{6}).
         /// </summary>
         internal static string AppUserAgentTemplate {
             get {
diff --git a/src/corelib/Properties/Resources.resx b/src/corelib/Properties/Resources.resx
index f44f6f47..a8353617 100644
--- a/src/corelib/Properties/Resources.resx
+++ b/src/corelib/Properties/Resources.resx
@@ -133,7 +133,7 @@
     <value>NT</value>
   </data>
   <data name="AppUserAgentTemplate" xml:space="preserve">
-    <value>Mozilla/5.0 ({0} {1} {2}.{3}; {4}; rv:{5}) {6} ({7})</value>
+    <value>Mozilla/5.0 ({0} {1} {2}; {3}; {4}) {5}/{6})</value>
   </data>
   <data name="BackUpLocalDir" xml:space="preserve">
     <value>backups</value>