diff --git a/resources/templates/provision/yealink/cp860/directory.xml b/resources/templates/provision/yealink/cp860/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/cp860/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t20p/directory.xml b/resources/templates/provision/yealink/t20p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t20p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t21p/directory.xml b/resources/templates/provision/yealink/t21p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t21p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t22p/directory.xml b/resources/templates/provision/yealink/t22p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t22p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t23g/directory.xml b/resources/templates/provision/yealink/t23g/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t23g/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t23p/directory.xml b/resources/templates/provision/yealink/t23p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t23p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t26p/directory.xml b/resources/templates/provision/yealink/t26p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t26p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t27p/directory.xml b/resources/templates/provision/yealink/t27p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t27p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t28p/directory.xml b/resources/templates/provision/yealink/t28p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t28p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t29g/directory.xml b/resources/templates/provision/yealink/t29g/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t29g/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t32g/directory.xml b/resources/templates/provision/yealink/t32g/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t32g/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t32g/favorite_settings.xml b/resources/templates/provision/yealink/t32g/favorite_settings.xml
new file mode 100644
index 0000000000..b4cc2caca2
--- /dev/null
+++ b/resources/templates/provision/yealink/t32g/favorite_settings.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t38g/directory.xml b/resources/templates/provision/yealink/t38g/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t38g/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t41p/directory.xml b/resources/templates/provision/yealink/t41p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/t41p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/vp530/directory.xml b/resources/templates/provision/yealink/vp530/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/vp530/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/w52p/directory.xml b/resources/templates/provision/yealink/w52p/directory.xml
new file mode 100644
index 0000000000..a05b029e18
--- /dev/null
+++ b/resources/templates/provision/yealink/w52p/directory.xml
@@ -0,0 +1,74 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	{if $row.phone_number != ""}
+		<Telephone>{$row.phone_number}</Telephone>
+	{else}
+		<Telephone>{$row.phone_extension}</Telephone>
+	{/if}
+	</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+	<DirectoryEntry>
+	{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+	{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+	{/if}
+	
+	{if $row.category == "extensions"}
+		{if $row.phone_number != ""}
+			<Telephone>{$row.phone_number}</Telephone>
+		{else}
+			<Telephone>{$row.phone_extension}</Telephone>
+		{/if}
+	{else}
+	{foreach $row.numbers as $number}
+		{if $number.phone_number != ""}
+			<Telephone>{$number.phone_number}</Telephone>
+		{else}		
+			<Telephone>{$number.phone_extension}</Telephone>
+		{/if}
+	{/foreach}
+	{/if}
+	</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file