diff --git a/CSM/beta/VersionFeed.xml b/CSM/beta/VersionFeed.xml
index c792a779..2f27bf4e 100644
--- a/CSM/beta/VersionFeed.xml
+++ b/CSM/beta/VersionFeed.xml
@@ -7,6 +7,34 @@
   <link href="http://servermanagers.freeforums.net/" />
   <updated>2021-12-17T00:00:00Z</updated>
 
+  <entry>
+    <id>urn:uuid:40905243-2E97-4FCD-ACEA-53C9D42E69F0</id>
+    <title>1.1.58 (1.1.58.11)</title>
+    <summary>1.1.58.11</summary>
+    <link href="" />
+    <updated>2021-12-18T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">BUGFIX</u>
+          <br/>
+          <ul>
+            <li>Fixed the cleanup of the log files generated by the auto processes (Backup, Update and Shutdown/Restart).<br/>NOTE: It will not cleanup the existing files, you need to do that manually.</li>
+          </ul>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Global Settings - Added new Log settings which allow you to turn if on/off and set the number of days/files to retain.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
   <entry>
     <id>urn:uuid:6EF11E7A-65D0-481E-A712-71CDB6C3F23F</id>
     <title>1.1.58 (1.1.58.10)</title>
diff --git a/CSM/beta/en-US.xaml b/CSM/beta/en-US.xaml
index 62110dfe..11151c00 100644
--- a/CSM/beta/en-US.xaml
+++ b/CSM/beta/en-US.xaml
@@ -79,6 +79,7 @@
     <sys:String x:Key="SliderUnits_Minutes">minutes</sys:String>
     <sys:String x:Key="SliderUnits_Hours">hours</sys:String>
     <sys:String x:Key="SliderUnits_Days">days</sys:String>
+    <sys:String x:Key="SliderUnits_Files">files</sys:String>
     <sys:String x:Key="SliderUnits_Items">items</sys:String>
     <sys:String x:Key="SliderUnits_XP">xp</sys:String>
     <sys:String x:Key="SliderUnits_Players">players</sys:String>
@@ -735,6 +736,12 @@
     <sys:String x:Key="GlobalSettings_VerifyServerAfterUpdateTooltip">If enabled, after the server has been updated from the cache, it will perform a server verification using steamcmd.</sys:String>
     <sys:String x:Key="GlobalSettings_UpdateDirectoryPermissionsLabel">Update Directory Permissions on Save</sys:String>
     <sys:String x:Key="GlobalSettings_UpdateDirectoryPermissionsTooltip">If enabled, when a save is performed, all folders under the server directory will be have the permissions check and if necessary fixed. WARNING: Disabling could prevent your server from running properly.</sys:String>
+    <sys:String x:Key="GlobalSettings_EnableLoggingLabel">Enable Logging</sys:String>
+    <sys:String x:Key="GlobalSettings_EnableLoggingTooltip">If enabled, all logging will be enabled.</sys:String>
+    <sys:String x:Key="GlobalSettings_LoggingMaxArchiveDaysLabel">Delete Logs After</sys:String>
+    <sys:String x:Key="GlobalSettings_LoggingMaxArchiveDaysTooltip">How old the log files must be to be deleted in days.</sys:String>
+    <sys:String x:Key="GlobalSettings_LoggingMaxArchiveFilesLabel">Max Number of Logs</sys:String>
+    <sys:String x:Key="GlobalSettings_LoggingMaxArchiveFilesTooltip">The maximum number of log files that will be kept.</sys:String>
 
     <sys:String x:Key="GlobalSettings_AutoUpdateLabel">Enable Auto Update</sys:String>
     <sys:String x:Key="GlobalSettings_AutoUpdate_GameServerLabel">Game Server</sys:String>
diff --git a/CSM/beta/latest.txt b/CSM/beta/latest.txt
index 59d784ce..d72f8b3d 100644
--- a/CSM/beta/latest.txt
+++ b/CSM/beta/latest.txt
@@ -1 +1 @@
-1.1.58.10
+1.1.58.11
diff --git a/CSM/beta/latest.zip b/CSM/beta/latest.zip
index 7139f22d..afe43c18 100644
Binary files a/CSM/beta/latest.zip and b/CSM/beta/latest.zip differ