diff --git a/debian/modules.conf b/debian/modules.conf
new file mode 100644
index 0000000..2f22ec0
--- /dev/null
+++ b/debian/modules.conf
@@ -0,0 +1,98 @@
+## PASSTHRU_CODEC_MODULES
+codecs/mod_g729
+codecs/mod_g723_1
+codecs/mod_amr
+codecs/mod_amrwb
+## Modules listed by those built by default, then those that are added in this package
+## APPLICATIONS_MODULES
+applications/mod_avmd
+applications/mod_callcenter
+applications/mod_cidlookup
+applications/mod_cluechoo
+applications/mod_commands
+applications/mod_conference
+applications/mod_curl
+applications/mod_db
+applications/mod_directory
+applications/mod_distributor
+applications/mod_dptools
+applications/mod_easyroute
+applications/mod_enum
+applications/mod_esf
+applications/mod_expr
+applications/mod_fifo
+applications/mod_fsv
+applications/mod_hash
+applications/mod_lcr
+applications/mod_limit
+applications/mod_memcache
+applications/mod_nibblebill
+applications/mod_redis
+applications/mod_rss
+applications/mod_snom
+applications/mod_spandsp
+applications/mod_spy
+applications/mod_stress
+applications/mod_valet_parking
+applications/mod_vmd
+applications/mod_voicemail
+## ASR_TTS_MODULES
+asr_tts/mod_pocketsphinx
+asr_tts/mod_flite
+asr_tts/mod_tts_commandline
+## CODECS_MODULES
+codecs/mod_bv
+codecs/mod_h26x
+codecs/mod_speex
+codecs/mod_celt
+codecs/mod_codec2
+codecs/mod_ilbc
+codecs/mod_mp4v
+codecs/mod_silk
+codecs/mod_siren
+codecs/mod_theora
+## DIALPLANS_MODULES
+dialplans/mod_dialplan_asterisk
+dialplans/mod_dialplan_directory
+dialplans/mod_dialplan_xml
+## ENDPOINTS_MODULES
+endpoints/mod_dingaling
+endpoints/mod_portaudio
+endpoints/mod_sofia
+endpoints/mod_loopback
+../../libs/freetdm/mod_freetdm
+endpoints/mod_skypopen
+endpoints/mod_skinny
+## EVENT_HANDLERS_MODULES
+event_handlers/mod_event_multicast
+event_handlers/mod_event_socket
+event_handlers/mod_cdr_csv
+## FORMATS_MODULES
+formats/mod_file_string
+formats/mod_local_stream
+formats/mod_native_file
+formats/mod_portaudio_stream
+formats/mod_shout
+formats/mod_sndfile
+formats/mod_tone_stream
+## LANGUAGES_MODULES
+languages/mod_spidermonkey
+languages/mod_perl
+languages/mod_lua
+languages/mod_python
+## LOGGERS_MODULES
+loggers/mod_console
+loggers/mod_logfile
+loggers/mod_syslog
+## SAY_MODULES
+say/mod_say_en
+say/mod_say_it
+say/mod_say_de
+say/mod_say_fr
+say/mod_say_es
+say/mod_say_nl
+say/mod_say_ru
+## XML_INT_MODULES
+xml_int/mod_xml_rpc
+xml_int/mod_xml_curl
+xml_int/mod_xml_cdr
diff --git a/debian/rules b/debian/rules
index 94aee73..472a05a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,36 +4,6 @@
 export DH_VERBOSE=1
 export DH_OPTIONS
 export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
-export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr codecs/mod_amrwb
-# Modules listed by those built by default, then those that are added in this package
-export APPLICATION_MODULES_AE= applications/mod_avmd applications/mod_callcenter applications/mod_cidlookup applications/mod_cluechoo \
- applications/mod_commands applications/mod_conference applications/mod_curl applications/mod_db applications/mod_directory \
- applications/mod_distributor applications/mod_dptools applications/mod_easyroute applications/mod_enum \
- applications/mod_esf applications/mod_expr 
-export APPLICATION_MODULES_FM= applications/mod_fifo applications/mod_fsv applications/mod_hash applications/mod_lcr applications/mod_limit \
- applications/mod_memcache 
-export APPLICATION_MODULES_NY= applications/mod_nibblebill applications/mod_redis applications/mod_rss applications/mod_snom \
- applications/mod_spandsp applications/mod_spy applications/mod_stress \
- applications/mod_valet_parking applications/mod_vmd applications/mod_voicemail 
-
-export APPLICATIONS_MODULES= $(APPLICATION_MODULES_AE) $(APPLICATION_MODULES_FM) $(APPLICATION_MODULES_NY) $(APPLICATION_MODULES_VZ) 
-export ASR_TTS_MODULES= asr_tts/mod_pocketsphinx  asr_tts/mod_flite asr_tts/mod_tts_commandline
-export CODECS_MODULES= codecs/mod_bv codecs/mod_h26x codecs/mod_speex codecs/mod_celt codecs/mod_codec2 codecs/mod_ilbc codecs/mod_mp4v \
- codecs/mod_silk codecs/mod_siren codecs/mod_theora 
-export DIALPLANS_MODULES= dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml 
-export ENDPOINTS_MODULES= endpoints/mod_dingaling endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_loopback  \
- ../../libs/freetdm/mod_freetdm endpoints/mod_skypopen endpoints/mod_skinny 
-export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv
-export FORMATS_MODULES= formats/mod_file_string formats/mod_local_stream formats/mod_native_file formats/mod_portaudio_stream \
- formats/mod_shout formats/mod_sndfile formats/mod_tone_stream 
-export LANGUAGES_MODULES=languages/mod_spidermonkey languages/mod_perl languages/mod_lua languages/mod_python
-export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog
-export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl say/mod_say_ru
-export XML_INT_MODULES=xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr
-export MYMODULES= $(PASSTHRU_CODEC_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(XML_INT_MODULES)
-export MODULES=$(MYMODULES)
-
-
 
 ifndef AUTOCONF
 	AUTOCONFS := $(wildcard /usr/bin/autoconf*)
@@ -169,10 +139,7 @@ upstream-convert:
 
 config.status: configure
 	dh_testdir
-	rm -f modules.conf
-	touch modules.conf
-	echo $(MODULES)
-	for i in $(MODULES); do echo $$i >> modules.conf; done
+	cp debian/modules.conf modules.conf
 	./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES}
 
 configure: bootstrap.sh # .pc/applied-patches
@@ -199,6 +166,7 @@ clean:  # .pc/applied-patches
 	rm -f configure config.status
 	rm -f */*/config.status
 	rm -f */*/*/config.status
+	rm -f modules.conf
 	dh_clean
 
 install: build