diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 55626d9902..ee9e0b22c7 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -610,7 +610,7 @@ include "root.php";
 							$templates['Yealink SIP-T52S'] = 'yealink/t52s';
 							$templates['Yealink SIP-T54S'] = 'yealink/t54s';
 							$templates['Yealink SIP-T56A'] = 'yealink/t56a';
-							$templates['Yealink SIP-T58V'] = 'yealink/t58v';
+							$templates['Yealink SIP-T58'] = 'yealink/t58v';
 							$templates['VP530P'] = 'yealink/vp530';
 							$templates['Yealink SIP-W52P'] = 'yealink/w52p';
 							$templates['Yealink SIP-W56P'] = 'yealink/w56p';
diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index 9f097e33fc..e0a69ee58a 100755
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -204,7 +204,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "https://server.yourdomain.com/app/yealink/resources/firmware";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Base URL for Yealink Firmware";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Base URL for Yealink Firmware.  Download from http://support.yealink.com";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e8f3e617-a6b3-4859-af59-04e2349f3d49";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
@@ -338,9 +338,9 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t54s";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "t54s-70.81.0.10.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "T4S(T52S)-70.82.0.20.rom";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the T54S firmware ROM";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Firmware tested 2017-11-26";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ffd1ad7-1b00-41f7-8e9319412127245a";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
diff --git a/resources/templates/provision/yealink/t58v/y000000000000.boot b/resources/templates/provision/yealink/t58v/y000000000000.boot
index 05b0fdf57d..321c342d01 100755
--- a/resources/templates/provision/yealink/t58v/y000000000000.boot
+++ b/resources/templates/provision/yealink/t58v/y000000000000.boot
@@ -1,4 +1,8 @@
 #!version:1.0.0.1
 ## The header above must appear as-is in the first line
 
-#overwrite_mode = 1
\ No newline at end of file
+
+include:config "y000000000058.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
\ No newline at end of file