diff --git a/resources/templates/provision/polycom/6.x/{$mac}-directory.xml b/resources/templates/provision/polycom/6.x/{$mac}-directory.xml
new file mode 100644
index 0000000000..bbc5b1624b
--- /dev/null
+++ b/resources/templates/provision/polycom/6.x/{$mac}-directory.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<directory>
+	<item_list>
+		{assign var=x value=1}
+		{foreach $contacts as $row}
+		<item>
+			{if $row.contact_name_given != ""}
+			<ln>{$row.contact_name_family}</ln>
+			<fn>{$row.contact_name_given}</fn>
+			{else}
+			<ln>{$row.contact_organization}</ln>
+			{/if}
+			{if $row.phone_number != ""}
+			<ct>{$row.phone_number}</ct>
+			{else}
+			<ct>{$row.phone_extension}</ct>
+			{/if}
+			<rt>7</rt>
+			<dc/>
+			<ad>0</ad>
+			<ar>0</ar>
+			<bw>0</bw>
+			<bb>0</bb>
+		</item>
+		{assign var=x value=$x+1}
+		{/foreach}
+	</item_list>
+</directory>
diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg
new file mode 100644
index 0000000000..b3888bafb4
--- /dev/null
+++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<PHONE>
+	<REGISTRATION
+	{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
+		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
+		reg.{$row.line_number}.label="{$row.display_name}"
+		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
+		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
+		{if isset($row.shared_line)}reg.{$row.line_number}.type="{$row.shared_line}"{else}reg.{$row.line_number}.type="private"{/if}
+		reg.{$row.line_number}.thirdPartyName=""
+		reg.{$row.line_number}.auth.userId="{$row.user_id}"
+		reg.{$row.line_number}.auth.password="{$row.password}"
+                {if isset($line_key_value_{$row.line_number})}reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"{else}reg.{$row.line_number}.lineKeys="1"{/if}
+		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
+		{if isset($row.sip_port)}reg.{$row.line_number}.outboundProxy.port="{$row.sip_port}"{else}reg.{$row.line_number}.outboundProxy.port="5060"{/if}
+		{if $row.sip_transport == ''}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.outboundProxy.transport="UDPOnly"{/if}
+		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.outboundProxy.transport="TLS" {/if}
+		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.outboundProxy.transport="DNSnaptr"{/if}
+		{if isset($row.server_address_primary)}
+		reg.{$row.line_number}.server.1.address="{$row.server_address_primary}"
+		{else}
+		reg.{$row.line_number}.server.1.address="{$row.server_address}"
+		{/if}
+		{if isset($row.sip_port)}
+		reg.{$row.line_number}.server.1.port="{$row.sip_port}"
+		{else}
+		reg.{$row.line_number}.server.1.port="5060"
+		{/if}
+		{if $row.sip_transport == ''}reg.{$row.line_number}.server.1.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.server.1.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.1.transport="UDPOnly"{/if}
+		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.1.transport="TLS" {/if}
+		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.1.transport="DNSnaptr"{/if}
+		{if isset($row.register_expires)}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{/if}
+		reg.{$row.line_number}.server.2.address="{$row.server_address_secondary}"
+		{if isset($row.sip_port)}
+		reg.{$row.line_number}.server.2.port="{$row.sip_port}"
+		{else}reg.{$row.line_number}.server.1.port="5060"
+		{/if}
+		{if $row.sip_transport == ''}reg.{$row.line_number}.server.2.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.server.2.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.2.transport="UDPOnly"{/if}
+		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.2.transport="TLS" {/if}
+		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.2.transport="DNSnaptr"{/if}
+		{if isset($row.register_expires)}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{/if}
+	{/foreach}
+	/>
+	<SECURITY
+		sec.srtp.enable="{$polycom_srtp_enable}"
+		sec.srtp.offer="{$polycom_srtp_offer}"
+		sec.srtp.require="{$polycom_srtp_require}"
+		{if isset($polycom_root_cert)}sec.TLS.customCaCert.5="{$polycom_root_cert}"{/if}
+		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
+		{if isset($polycom_provision_cert_validate)}
+		device.sec.TLS.prov.strictCertCommonNameValidation.set ="1" 
+		device.sec.TLS.prov.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"
+		{/if}
+	/>
+	<DEVICE_SETTINGS
+		device.set="1"
+		device.baseProfile.set="1"
+		device.baseProfile="Generic"
+		device.sntp.serverName="{$ntp_server_primary}"
+		device.sntp.gmtOffset="{$polycom_gmt_offset}"
+		device.prov.upgradeServer.set="1"
+		device.prov.upgradeServer="{$polycom_firmware_url}"
+		{if isset($admin_password)}
+		device.auth.localUserPassword.set="1" 
+		device.auth.localUserPassword="{$admin_password}"
+		{/if}
+		{if isset($admin_password)}
+		device.auth.localAdminPassword.set="1"
+		device.auth.localAdminPassword="{$admin_password}"
+		{/if}
+		{if isset($dns_server_primary)}device.dns.serverAddress="{$dns_server_primary}"{/if}
+		{if isset($dns_server_secondary)}device.dns.altSrvAddress="{$dns_server_secondary}"{/if}
+		{if isset($polycom_provision_url)}
+		device.prov.serverName.set="1"
+		device.prov.serverName="{$polycom_provision_url}"
+		{else}
+		device.prov.serverName.set="1"
+		device.prov.serverName="{$domain_name}/app/provision/"
+		{/if}
+		device.prov.serverType.set="1"
+		device.prov.serverType="{$polycom_server_type}"
+		device.prov.user.set="1"
+		device.prov.user="{$http_auth_username}"
+		device.prov.password.set="1"
+		device.prov.password="{$http_auth_password}"
+		device.prov.tagSerialNo.set="1"
+		device.prov.tagSerialNo="1"
+		{if isset($polycom_syslog_server)}
+		device.syslog.serverName.set="1"
+		device.syslog.serverName="{$polycom_syslog_server}"
+		device.syslog.transport.set="1"
+		device.syslog.transport="{$polycom_syslog_transport}"
+		device.syslog.facility.set="1"
+		device.syslog.facility="{$polycom_syslog_facility}"
+		device.syslog.renderLevel.set="1"
+		device.syslog.renderLevel="{$polycom_syslog_renderlevel}"
+		device.syslog.prependMac.set="1"
+		device.syslog.prependMac="{$polycom_syslog_prependmac}"
+		{/if}
+	/>
+	<SNTP
+		tcpIpApp.sntp.resyncPeriod="86400"
+		tcpIpApp.sntp.address="{$ntp_server_primary}"
+		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
+		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
+		{if $daylight_savings_enabled == "false"}
+		tcpIpApp.sntp.daylightSavings.enable="0"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="1"
+		{/if}
+		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
+		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
+		tcpIpApp.sntp.daylightSavings.start.date="{$daylight_savings_start_day}"
+		tcpIpApp.sntp.daylightSavings.start.time="{$daylight_savings_start_time}"
+		tcpIpApp.sntp.daylightSavings.start.dayOfWeek="1"
+		tcpIpApp.sntp.daylightSavings.start.dayOfWeek.lastInMonth="0"
+		tcpIpApp.sntp.daylightSavings.stop.month="{$daylight_savings_stop_month}"
+		tcpIpApp.sntp.daylightSavings.stop.date="{$daylight_savings_stop_day}"
+		tcpIpApp.sntp.daylightSavings.stop.time="{$daylight_savings_stop_time}"
+		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek="1"
+		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
+	/>
+	<DIALPLAN
+		{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}
+	/>
+	<DEVICE_KEYS
+		attendant.uri=""
+		{if isset($polycom_remotecallerid_automata)}
+			attendant.behaviors.display.remoteCallerID.automata="{$polycom_remotecallerid_automata}"
+		{else}
+			attendant.behaviors.display.remoteCallerID.automata="0"
+		{/if}
+		{if isset($polycom_remotecallerid_normal)}
+			attendant.behaviors.display.remoteCallerID.normal="{$polycom_remotecallerid_normal}"
+		{else}
+			attendant.behaviors.display.remoteCallerID.normal="0"
+		{/if}
+		{if isset($polycom_spontaneouscallappearances_automata)}
+			attendant.behaviors.display.spontaneousCallAppearances.automata="{$polycom_spontaneouscallappearances_automata}"
+		{else}
+			attendant.behaviors.display.spontaneousCallAppearances.automata="0"
+		{/if}
+		{if isset($polycom_spontaneouscallappearances_normal)}
+			attendant.behaviors.display.spontaneousCallAppearances.normal="{$polycom_spontaneouscallappearances_normal}"
+		{else}
+			attendant.behaviors.display.spontaneousCallAppearances.normal="0"
+		{/if}
+		feature.enhancedFeatureKeys.enabled="1"
+		{foreach $keys["line"] as $row}
+			{if $row.device_key_type == "automata" || $row.device_key_type == "normal"}
+				attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
+				attendant.resourceList.{$row.device_key_id}.callAddress=""
+				attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
+				attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
+				attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
+			{else}
+				{if $row.device_key_type != "line"}
+					{if $row.device_key_type == "URL"}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
+					{else}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
+						key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
+					{/if}
+				{/if}
+			{/if}
+		{/foreach}
+	/>
+	<MULTICAST_PAGING
+		ptt.pageMode.enable="{$polycom_page_enable}"
+	/>
+	<REMOTE_PACKET_CAPTURE
+		diags.pcap.enabled="0"
+		diags.pcap.remote.enabled="0"
+	/>
+	<GENERAL
+		{if isset($polycom_nat_ip)}
+		nat.ip="{$polycom_nat_ip}"
+		{/if}
+		nat.keepalive.interval="30"
+		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
+		voIpProt.SIP.requestValidation.1.method="{$polycom_request_validation_method}"
+		voIpProt.SIP.requestValidation.1.request="{$polycom_request_validation_request}"
+		voIpProt.server.1.failOver.reRegisterOn="1"
+		voIpProt.server.1.failOver.failRegistrationOn="1"
+		voIpProt.server.1.failOver.onlySignalWithRegistered="1" 
+		voIpProt.server.1.failOver.failBack.mode="duration"
+		voIpProt.server.1.failOver.failBack.timeout="120"
+		voIpProt.server.2.failOver.reRegisterOn="1"
+		voIpProt.server.2.failOver.failRegistrationOn="1"
+		voIpProt.server.2.failOver.onlySignalWithRegistered="1" 
+		voIpProt.server.2.failOver.failBack.mode="duration"
+		voIpProt.server.2.failOver.failBack.timeout="120"
+		{if isset($polycom_bluetooth_radio_on)}feature.bluetooth.radioOn="{$polycom_bluetooth_radio_on}"{/if}
+		feature.broadsoftUcOne.enabled="0"
+		voice.volume.persist.handset="1"
+		voice.volume.persist.handsfree="1"
+		voice.volume.persist.headset="1"
+		feature.nonVolatileRingerVolume.enabled="1"
+		up.headsetMode="{$polycom_headset_mode}"
+		{if isset($polycom_analog_headset_option)}up.analogHeadsetOption="{$polycom_analog_headset_option}"{/if}
+		up.oneTouchVoiceMail="{$polycom_one_touch_voicemail}"
+		exchange.server.url="0.0.0.0"
+		up.warningLevel="2"
+		call.defaultTransferType="{$polycom_default_transfer_method}"
+		call.callWaiting.enable="{$polycom_call_waiting}"
+		call.callWaiting.ring="beep"
+		call.callsPerLineKey="{$polycom_calls_per_line_key}"
+		up.OffHookLineView.enabled="{$polycom_offhook_line_view_enabled}"
+		prov.polling.enabled="{$polycom_provision_polling_enabled}"
+		prov.polling.time="{$polycom_provision_polling_time}"
+		feature.urlDialing.enabled="0"
+		feature.logUpload.enabled="{$polycom_log_upload_enabled}"
+		powerSaving.enable="{$polycom_power_saving_enable}"
+		voice.aec.hf.enable="1"
+		voice.aec.hs.enable="1"
+		dir.local.readonly="{$polycom_contact_list_readonly}"
+		{if isset($polycom_video_enable)}video.enable="{$polycom_video_enable}"{/if}
+		{if isset($polycom_video_audio_call_mode)}video.callMode.default="{$polycom_video_audio_call_mode}"	{/if}
+		{if isset($polycom_video_audio_toggle)}feature.audioVideoToggle.enabled="{$polycom_video_audio_toggle}"	{/if}
+		msg.mwi.{$row.line_number}.callBackMode="contact"
+		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
+		feature.intercom.enable="{$polycom_intercom_enable}"
+	/>
+	<SOFT_KEYS
+		softkey.1.label="VMTransfer"
+		softkey.1.action="^*99$P1N4$$Trefer$"
+		softkey.1.enable="1"
+		softkey.1.use.active="1"
+		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
+		efk.efkprompt.1.status="1"
+		efk.efkprompt.1.type="numeric"
+		{if isset($polycom_softkey_do_not_disturb)}softkey.feature.doNotDisturb="{$polycom_softkey_do_not_disturb}"{/if}
+		{if isset($polycom_softkey_forward)}softkey.feature.forward="{$polycom_softkey_forward}"{/if}
+	/>
+	<USB 
+		feature.callRecording.enabled="0"
+	/>
+	<LANGUAGE
+		lcl.ml.lang="{$polycom_display_language}"
+	/>
+</PHONE>