diff --git a/conf/freeswitch.conf b/conf/freeswitch.conf
index 4bbc1d2ada..6345a0f73c 100644
--- a/conf/freeswitch.conf
+++ b/conf/freeswitch.conf
@@ -24,6 +24,7 @@ load => mod_exosip
 load => mod_iax
 ;load => mod_portaudio
 ;load => mod_woomera
+;load => mod_wanpipe
 
 ; Applications
 load => mod_bridgecall
@@ -48,8 +49,6 @@ load => mod_sndfile
 load => mod_softtimer
 
 
-load => mod_wanpipe
-
 ;---- IAX PROTOCOL
 ;--------------------------------------------------------------------------------
 [+iax.conf]
@@ -65,10 +64,10 @@ codec_rates=8
 ;--------------------------------------------------------------------------------
 [+exosip.conf]
 [settings]
-debug => 10
 port => 5060
-dialplan => demo
-codec_prefs => PCMU
+dialplan => pcre
+supress_telephony_events => yes
+dtmf_duration => 100
 
 ;---- WOOMERA PROTOCOL
 ;--------------------------------------------------------------------------------
@@ -80,19 +79,37 @@ debug=0
 ;--------------------------------------------------------------------------------
 [+wanpipe.conf]
 [settings]
-debug => 0
-dialplan => demo
-bpf => 320
+ debug => 1
+ dialplan => pcre
+ mtu => 160
+ dtmf_on => 800
+ dtmf_off => 100
+ supress_dtmf_tone => yes
 
 [span]
  span => 1
  node => cpe
- switch => ni2
- dp = national
- l1 = ulaw
+
+ ;switch => ni2
+ switch => dms100
+ ;switch => lucent5e
+ ;switch => att4ess
+ ;switch => euroisdn
+ ;switch => gr303eoc
+ ;switch => gr303tmc
+
+ dp => national
+ ;dp => international
+ ;dp => local
+ ;dp => private
+ ;dp => unknown
+
+ l1 => ulaw
+ ;l1 => alaw
+
  bchan => 1-23
  dchan => 24
- dialplan => demo
+ dialplan => pcre
 
 
 ;---- SOUND CARD CHANNEL