diff --git a/build/modules.conf.in b/build/modules.conf.in
index 34c80d0093..1abe4e4ab4 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -8,8 +8,6 @@ applications/mod_dptools
 applications/mod_enum
 #applications/mod_osp
 applications/mod_fifo
-#applications/mod_fax
-#applications/mod_spandsp
 #applications/mod_curl
 applications/mod_voicemail
 #applications/mod_directory
@@ -39,7 +37,7 @@ codecs/mod_amr
 #codecs/mod_silk
 codecs/mod_g729
 codecs/mod_h26x
-codecs/mod_voipcodecs
+codecs/mod_spandsp
 codecs/mod_bv
 codecs/mod_ilbc
 codecs/mod_speex
diff --git a/conf/autoload_configs/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
index ad23f86de8..47707192fc 100644
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@@ -45,8 +45,6 @@
     <load module="mod_fifo"/>
     <load module="mod_voicemail"/>
     <!--<load module="mod_directory"/>-->
-    <!--<load module="mod_fax"/>-->
-    <!--<load module="mod_spandsp"/>-->
     <!--<load module="mod_lcr"/>-->
     <load module="mod_limit"/>
     <load module="mod_esf"/>
@@ -64,7 +62,7 @@
     <load module="mod_dialplan_asterisk"/>
 
     <!-- Codec Interfaces -->
-    <load module="mod_voipcodecs"/>
+    <load module="mod_spandsp"/>
     <load module="mod_g723_1"/>
     <load module="mod_g729"/>
     <load module="mod_amr"/>
diff --git a/debian/freeswitch.install b/debian/freeswitch.install
index b780187453..78bcc31586 100644
--- a/debian/freeswitch.install
+++ b/debian/freeswitch.install
@@ -18,6 +18,7 @@ opt/freeswitch/conf/autoload_configs/enum.conf.xml
 opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml
 opt/freeswitch/conf/autoload_configs/event_socket.conf.xml
 opt/freeswitch/conf/autoload_configs/fax.conf.xml
+opt/freeswitch/conf/autoload_configs/spandsp.conf.xml
 opt/freeswitch/conf/autoload_configs/fifo.conf.xml
 opt/freeswitch/conf/autoload_configs/ivr.conf.xml
 opt/freeswitch/conf/autoload_configs/java.conf.xml
@@ -129,7 +130,7 @@ opt/freeswitch/mod/mod_enum.so*
 opt/freeswitch/mod/mod_esf.so*
 opt/freeswitch/mod/mod_event_*.so*
 opt/freeswitch/mod/mod_expr.so*
-opt/freeswitch/mod/mod_fax.so*
+opt/freeswitch/mod/mod_spandsp.so*
 opt/freeswitch/mod/mod_fifo.so*
 opt/freeswitch/mod/mod_fsv.so*
 opt/freeswitch/mod/mod_h26x.so*
@@ -159,7 +160,6 @@ opt/freeswitch/mod/mod_tts_commandline.so*
 opt/freeswitch/mod/mod_valet_parking.so*
 opt/freeswitch/mod/mod_vmd.so*
 opt/freeswitch/mod/mod_voicemail.so*
-opt/freeswitch/mod/mod_voipcodecs.so*
 opt/freeswitch/mod/mod_xml_*.so*
 opt/freeswitch/mod/ozmod_analog_em.so*
 opt/freeswitch/mod/ozmod_analog.so*
diff --git a/debian/rules b/debian/rules
index f2c57ea95a..fd027c53c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,11 @@ export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr
 export APPLICATIONS_MODULES=applications/mod_cluechoo applications/mod_commands applications/mod_conference applications/mod_dptools \
                             applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_fsv \
                             applications/mod_limit applications/mod_valet_parking applications/mod_voicemail applications/mod_rss \
-                            applications/mod_fax applications/mod_cidlookup applications/mod_curl applications/mod_easyroute \
+                            applications/mod_spandsp applications/mod_cidlookup applications/mod_curl applications/mod_easyroute \
 			    applications/mod_lcr applications/mod_nibblebill applications/mod_snom \
 			    applications/mod_spy applications/mod_vmd applications/mod_directory
 export ASR_TTS_MODULES=asr_tts/mod_tts_commandline
-export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs codecs/mod_siren codecs/mod_celt
+export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_siren codecs/mod_celt
 export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml
 export DIRECTORIES_MODULES=
 export DOTNET_MODULES=
diff --git a/freeswitch.spec b/freeswitch.spec
index 8f386e7f64..dbcb31ba93 100644
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -228,8 +228,8 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
 %endif
 
 PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr codecs/mod_amrwb"
-APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_directory applications/mod_fsv applications/mod_lcr applications/mod_easyroute applications/mod_stress applications/mod_vmd applications/mod_limit applications/mod_soundtouch applications/mod_fax"
-CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex codecs/mod_celt codecs/mod_siren codecs/mod_bv"
+APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_directory applications/mod_fsv applications/mod_lcr applications/mod_easyroute applications/mod_stress applications/mod_vmd applications/mod_limit applications/mod_soundtouch applications/mod_spandsp"
+CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_siren codecs/mod_bv"
 DIALPLANS_MODULES="dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml"
 DIRECTORIES_MODULES=""
 ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_portaudio endpoints/mod_sofia ../../libs/openzap/mod_openzap endpoints/mod_loopback"
@@ -396,6 +396,7 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/fax.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/fifo.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/shout.conf.xml
+%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/spandsp.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/timezones.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/ivr.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/java.conf.xml
@@ -474,7 +475,6 @@ fi
 %{prefix}/mod/mod_flite.so*
 %{prefix}/mod/mod_ilbc.so* 
 %{prefix}/mod/mod_h26x.so*
-%{prefix}/mod/mod_voipcodecs.so* 
 %{prefix}/mod/mod_speex.so* 
 %{prefix}/mod/mod_dialplan_directory.so* 
 %{prefix}/mod/mod_dialplan_xml.so* 
@@ -503,7 +503,7 @@ fi
 %{prefix}/mod/mod_bv.so
 %{prefix}/mod/mod_stress.so
 %{prefix}/mod/mod_shout.so
-%{prefix}/mod/mod_fax.so
+%{prefix}/mod/mod_spandsp.so
 %{prefix}/mod/mod_soundtouch.so
 %{prefix}/mod/mod_vmd.so
 %{prefix}/mod/mod_unimrcp.so