diff --git a/build/modules.conf.in b/build/modules.conf.in
index fd1cbc17ef..ad70be9601 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -35,7 +35,6 @@ endpoints/mod_iax
 #endpoints/mod_portaudio
 endpoints/mod_sofia
 endpoints/mod_loopback
-#endpoints/mod_wanpipe
 #endpoints/mod_woomera
 #endpoints/mod_alsa
 #../../libs/openzap/mod_openzap
diff --git a/conf/autoload_configs/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
index 14c92c7fb1..673c8a9c74 100644
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@@ -33,7 +33,6 @@
     <!-- <load module="mod_alsa"/> -->
     <load module="mod_sofia"/>
     <load module="mod_loopback"/>
-    <!-- <load module="mod_wanpipe"/> -->
     <!-- <load module="mod_woomera"/> -->
     <!-- <load module="mod_openzap"/> -->
 
diff --git a/freeswitch.spec b/freeswitch.spec
index 3ed6902a7d..20cf887715 100644
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -165,7 +165,7 @@ LANGUAGES_MODULES="languages/mod_perl languages/mod_lua"
 LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog"
 SAY_MODULES="say/mod_say_en"
 TIMERS_MODULES=
-DISABLED_MODULES="applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl"
+DISABLED_MODULES="applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl"
 XML_INT_MODULES="xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr"
 MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES"
 
@@ -329,7 +329,6 @@ userdel freeswitch
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/switch.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/syslog.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/voicemail.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/wanpipe.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/woomera.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/xml_cdr.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/xml_curl.conf.xml
@@ -403,7 +402,6 @@ userdel freeswitch
 %{prefix}/mod/ozmod_analog_em.so
 %{prefix}/mod/ozmod_isdn.so
 %{prefix}/mod/ozmod_ss7_boost.so
-%{prefix}/mod/ozmod_wanpipe.so
 %{prefix}/mod/ozmod_zt.so
 
 %files codec-passthru-amr