diff --git a/resources/templates/provision/cisco/7940/SIP{$mac}.cnf b/resources/templates/provision/cisco/7940/SIP{$mac}.cnf
index 8cbd66528b..2d9adbd63f 100644
--- a/resources/templates/provision/cisco/7940/SIP{$mac}.cnf
+++ b/resources/templates/provision/cisco/7940/SIP{$mac}.cnf
@@ -138,10 +138,10 @@ autocomplete: "1"
 time_format_24hr: "0"
 
 # URL for external Phone Services
-#services_url: "http://{$domain_name}/app/provision/?file=services.xml"
+#services_url: "http://{$domain_name}/app/provision/file/services.xml"
 
 # URL for external Directory location
-directory_url: "http://{$domain_name}/app/provision/?file=directory.xml"
+directory_url: "http://{$domain_name}/app/provision/file/directory.xml"
 
 # URL for branding logo
 #logo_url: "http://{$domain_name}/app/provision/logo.bmp"
diff --git a/resources/templates/provision/cisco/7940/directory-enterprise.xml b/resources/templates/provision/cisco/7940/directory-enterprise.xml
index 4c145c770d..5c977112b0 100644
--- a/resources/templates/provision/cisco/7940/directory-enterprise.xml
+++ b/resources/templates/provision/cisco/7940/directory-enterprise.xml
@@ -1,31 +1,25 @@
-<CiscoIPPhoneMenu>
+<CiscoIPPhoneDirectory>
 	<Title>Enterprise</Title>
 	<Prompt>Please choose...</Prompt>
-	<SoftKeyItem>
-		<Name>Dial</Name>
-		<URL>SoftKey:Select</URL>
-		<Position>1</Position>
-	</SoftKeyItem>
 {assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "enterprise"}
-<MenuItem>
+<DirectoryEntry>
 {if $row.contact_name_given != ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 	<Name>{$row.contact_organization}</Name>
 {/if}
 {if $row.phone_number != ""}
-	<URL>Dial:{$row.phone_number}#</URL>
+	<Telephone>{$row.phone_number}</Telephone>
 {else}
-	<URL>Dial:{$row.phone_extension}#</URL>
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
-</MenuItem>
+</DirectoryEntry>
 {/if}
 {assign var=x value=$x+1}
 {/foreach}
-	<SoftKeyItem>
-		<Name>Exit</Name>
-		<URL>SoftKey:Exit</URL>
-		<Position>4</Position>
-	</SoftKeyItem>
-</CiscoIPPhoneMenu>
+</CiscoIPPhoneDirectory>
+
+
+
+
diff --git a/resources/templates/provision/cisco/7940/directory-personal.xml b/resources/templates/provision/cisco/7940/directory-personal.xml
index 5bbde47349..2e6750eb98 100644
--- a/resources/templates/provision/cisco/7940/directory-personal.xml
+++ b/resources/templates/provision/cisco/7940/directory-personal.xml
@@ -1,31 +1,24 @@
-<CiscoIPPhoneMenu>
+<CiscoIPPhoneDirectory>
 	<Title>Personal</Title>
 	<Prompt>Please choose...</Prompt>
-	<SoftKeyItem>
-		<Name>Dial</Name>
-		<URL>SoftKey:Select</URL>
-		<Position>1</Position>
-	</SoftKeyItem>
 {assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "personal"}
-<MenuItem>
+<DirectoryEntry>
 {if $row.contact_name_given != ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 	<Name>{$row.contact_organization}</Name>
 {/if}
 {if $row.phone_number != ""}
-	<URL>Dial:{$row.phone_number}#</URL>
+	<Telephone>{$row.phone_number}</Telephone>
 {else}
-	<URL>Dial:{$row.phone_extension}#</URL>
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
-</MenuItem>
+</DirectoryEntry>
 {/if}
 {assign var=x value=$x+1}
 {/foreach}
-	<SoftKeyItem>
-		<Name>Exit</Name>
-		<URL>SoftKey:Exit</URL>
-		<Position>4</Position>
-	</SoftKeyItem>
-</CiscoIPPhoneMenu>
+</CiscoIPPhoneDirectory>
+
+
+
diff --git a/resources/templates/provision/cisco/7940/directory-speed_dial.xml b/resources/templates/provision/cisco/7940/directory-speed_dial.xml
index ab7714c740..16138ed111 100644
--- a/resources/templates/provision/cisco/7940/directory-speed_dial.xml
+++ b/resources/templates/provision/cisco/7940/directory-speed_dial.xml
@@ -1,31 +1,21 @@
-<CiscoIPPhoneMenu>
+<CiscoIPPhoneDirectory>
 	<Title>Speed Dial</Title>
 	<Prompt>Please choose...</Prompt>
-	<SoftKeyItem>
-		<Name>Dial</Name>
-		<URL>SoftKey:Select</URL>
-		<Position>1</Position>
-	</SoftKeyItem>
 {assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "speed dial"}
-<MenuItem>
+<DirectoryEntry>
 {if $row.contact_name_given != ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 	<Name>{$row.contact_organization}</Name>
 {/if}
 {if $row.phone_number != ""}
-	<URL>Dial:{$row.phone_number}#</URL>
+	<Telephone>{$row.phone_number}</Telephone>
 {else}
-	<URL>Dial:{$row.phone_extension}#</URL>
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
-</MenuItem>
+</DirectoryEntry>
 {/if}
 {assign var=x value=$x+1}
 {/foreach}
-	<SoftKeyItem>
-		<Name>Exit</Name>
-		<URL>SoftKey:Exit</URL>
-		<Position>4</Position>
-	</SoftKeyItem>
-</CiscoIPPhoneMenu>
+</CiscoIPPhoneDirectory>
diff --git a/resources/templates/provision/cisco/7940/directory.xml b/resources/templates/provision/cisco/7940/directory.xml
index 2aeda06113..24351b9b2d 100644
--- a/resources/templates/provision/cisco/7940/directory.xml
+++ b/resources/templates/provision/cisco/7940/directory.xml
@@ -1,28 +1,17 @@
 <CiscoIPPhoneMenu>
 	<Title>Contacts</Title>
 	<Prompt>Please choose...</Prompt>
+
 	<!--
 	<MenuItem>
 		<Name>Personal</Name>
-		<URL>http://{$domain_name}/app/provision?file=directory-personal.xml</URL>
+		<URL>http://{$domain_name}/app/provision/file/directory-personal.xml</URL>
 	</MenuItem>
-	-->
-	<MenuItem>
-		<Name>Enterprise</Name>
-		<URL>http://{$domain_name}/app/provision?file=directory-enterprise.xml</URL>
+	-->	<MenuItem>		<Name>Enterprise</Name>
+		<URL>http://{$domain_name}/app/provision/file/directory-enterprise.xml?mac={$mac}</URL>
 	</MenuItem>
 	<MenuItem>
 		<Name>Speed Dial</Name>
-		<URL>http://{$domain_name}/app/provision/?file=directory-speed_dial.xml</URL>
+		<URL>http://{$domain_name}/app/provision/file/directory-speed_dial.xml?mac={$mac}</URL>
 	</MenuItem>
-	<SoftKeyItem>
-		<Name>Select</Name>
-		<URL>SoftKey:Select</URL>
-		<Position>1</Position>
-	</SoftKeyItem>
-	<SoftKeyItem>
-		<Name>Exit</Name>
-		<URL>SoftKey:Exit</URL>
-		<Position>4</Position>
-	</SoftKeyItem>
 </CiscoIPPhoneMenu>
\ No newline at end of file