diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml
index b98b1f4c11..843ab974b7 100644
--- a/conf/freeswitch.xml
+++ b/conf/freeswitch.xml
@@ -66,7 +66,7 @@
         <param name="debug" value="0"/>
         <!-- <param name="ip" value="1.2.3.4"> -->
         <param name="port" value="4569"/>
-        <param name="dialplan" value="flatfile"/>
+        <param name="dialplan" value="XML"/>
         <param name="codec_prefs" value="PCMU,PCMA,speex,L16"/>
         <param name="codec_master" value="us"/>
         <param name="codec_rates" value="8"/>
@@ -168,7 +168,7 @@
     <configuration name="portaudio.conf" description="Soundcard Endpoint">
       <settings>
         <param name="debug" value="2"/>
-        <param name="dialplan" value="flatfile"/>
+        <param name="dialplan" value="XML"/>
   
         <!-- partial string match on something in the name or the device # -->
         <param name="indev" value="USB"/>
@@ -215,9 +215,9 @@
   
       <context name="default">
         <extension name="devconf">
-          <condition field="destination_number" expression="888">
+          <condition field="destination_number" expression="^888$">
             <action application="bridge" data="exosip/888@66.250.68.194"/>
-  	</condition>
+  	  </condition>
         </extension>
         <!-- extensions starting with 4, all the numbers after 4 form a numeric filename
              continue=true means keep looking for more extensions to match
@@ -233,19 +233,19 @@
           <condition field="source" expression="mod_exosip"/>
           <condition field="destination_number" expression="^4(\d+)">
             <action application="playback" data="/var/sounds/beep.gsm"/>
-  	</condition>
+  	  </condition>
         </extension>
         <extension name="playsound2">
           <condition field="source" expression="mod_exosip"/>
           <condition field="destination_number" expression="^4(\d+)">
             <action application="playback" data="/root/$1.raw"/>
-  	</condition>
+  	  </condition>
         </extension>
         <!-- send everything with a certian RDNIS to Wanpipe ISDN -->
         <extension name="To PRI">
           <condition field="rdnis" expression="8881231234"/>
           <condition field="destination_number" expression="(.*)">
-  	  <action application="bridge" data="wanpipe/a/a/$1"/>
+  	    <action application="bridge" data="wanpipe/a/a/$1"/>
           </condition>
         </extension>
         <!-- Call *MUST* originate from mod_iax and also be dialing ext 9999-->
@@ -257,13 +257,13 @@
         </extension>
         <!-- Call the FreeSWITCH conference via SIP -->
         <extension name="FreeSWITCH Conference SIP">
-         <condition field="destination_number" expression="888">
+         <condition field="destination_number" expression="^888$">
            <action application="bridge" data="exosip/888@66.250.68.194"/>
          </condition>
         </extension>
         <!-- Call the FreeSWITCH conference via IAX -->
         <extension name="FreeSWITCH Conference IAX">
-         <condition field="destination_number" expression="8888">
+         <condition field="destination_number" expression="^8888$">
            <action application="bridge" data="iax/guest@66.250.68.194/888"/>
          </condition>
         </extension>