diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php
index 3eb6b3b0e0..08e8a1afb6 100644
--- a/app/polycom/app_config.php
+++ b/app/polycom/app_config.php
@@ -550,5 +550,45 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "04:00";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the time to stop polling when using random mode";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2ffdfa5b-2545-4d5b-a819-8cd36c866c28";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_customized";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "allow custom emergency numbers, for example 933";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0fb63bf9-66d0-4d71-b368-3f314a974e82";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "example.domain.tld";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "server handling emergency calls";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fae39a6e-df46-48db-8e4f-0b0bbe46f759";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_port";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5060";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "port on which server handling emergency calls is reachable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "18df4b4b-cb69-46fa-bee2-c984269a7af7";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_number";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "911";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "911";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ab84a4f1-b30c-464e-a838-665104903290";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_number";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "933";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "933 service";
 
 ?>
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index b688611f50..dacc712cf1 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -144,6 +144,14 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
+		{if $polycom_emergency_customized == "true") }
+			dialplan.routing.server.1.address="{$polycom_emergency_server}"
+			dialplan.routing.server.1.port="{$polycom_emergency_port}"
+				{foreach $polycom_emergency_number as $number name=emergencynumbers}
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.value="{$number}"
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.server.1="1"
+				{/foreach}
+		{/if}
 		{if isset($polycom_digitmap)}dialplan.digitmap="{$polycom_digitmap}"{else}dialplan.digitmap=""{/if}
 		{if isset($polycom_digitmap_timeout)}dialplan.digitmap.timeOut="{$polycom_digitmap_timeout}"{else}dialplan.digitmap.timeOut=""{/if}
 	/>
diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg
index 27a0746ee2..2fa3d32e37 100644
--- a/resources/templates/provision/polycom/6.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg
@@ -140,6 +140,14 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
+		{if $polycom_emergency_customized == "true") }
+			dialplan.routing.server.1.address="{$polycom_emergency_server}"
+			dialplan.routing.server.1.port="{$polycom_emergency_port}"
+				{foreach $polycom_emergency_number as $number name=emergencynumbers}
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.value="{$number}"
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.server.1="1"
+				{/foreach}
+		{/if}
 		{if isset($polycom_digitmap)}dialplan.digitmap="{$polycom_digitmap}"{else}dialplan.digitmap=""{/if}
 		{if isset($polycom_digitmap_timeout)}dialplan.digitmap.timeOut="{$polycom_digitmap_timeout}"{else}dialplan.digitmap.timeOut=""{/if}
 	/>