diff --git a/Makefile.am b/Makefile.am
index 407983c887..3f012260f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,6 +135,7 @@ depends:
 
 
 modules: $(NAME)
+	@if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
 	@echo making modules
 	@rm -f build/freeswitch.env
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
diff --git a/Makefile.in b/Makefile.in
index 14e967f162..1116f5a14c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1010,6 +1010,7 @@ depends:
 	rm build/freeswitch.env
 
 modules: $(NAME)
+	@if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
 	@echo making modules
 	@rm -f build/freeswitch.env
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
diff --git a/modules.conf b/modules.conf
deleted file mode 100644
index 6c94812e2d..0000000000
--- a/modules.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-event_handlers/mod_zeroconf
-applications/mod_bridgecall
-applications/mod_playback
-applications/mod_ivrtest
-#applications/mod_skel
-codecs/mod_gsm
-codecs/mod_g711
-codecs/mod_l16
-codecs/mod_speex
-dialplans/mod_dialplan_demo
-endpoints/mod_exosip
-endpoints/mod_iax
-#endpoints/mod_opal
-#endpoints/mod_portaudio
-#endpoints/mod_wanpipe
-endpoints/mod_woomera
-#event_handlers/mod_event_test
-event_handlers/mod_xmpp_event
-formats/mod_sndfile
-timers/mod_softtimer
-dialplans/mod_pcre
-directories/mod_ldap
-dialplans/mod_dialplan_directory
-
diff --git a/modules.conf.in b/modules.conf.in
index d7e75d9c94..579443643d 100644
--- a/modules.conf.in
+++ b/modules.conf.in
@@ -1,14 +1,23 @@
-# list the modules to build
-mod_bridgecall
-mod_dialplan_demo
-mod_softtimer
-#mod_zaptimer
-#mod_rtctimer
-mod_woomerachan
-mod_playback
-#mod_wanchan
-#mod_speexcodec
-#mod_speextest
-#mod_exosip
-mod_g711codec
-mod_rawaudio
+applications/mod_bridgecall
+applications/mod_playback
+applications/mod_ivrtest
+#applications/mod_skel
+codecs/mod_gsm
+codecs/mod_g711
+codecs/mod_l16
+codecs/mod_speex
+dialplans/mod_dialplan_demo
+endpoints/mod_exosip
+endpoints/mod_iax
+#endpoints/mod_opal
+#endpoints/mod_portaudio
+#endpoints/mod_wanpipe
+endpoints/mod_woomera
+#event_handlers/mod_event_test
+event_handlers/mod_xmpp_event
+formats/mod_sndfile
+timers/mod_softtimer
+dialplans/mod_pcre
+directories/mod_ldap
+dialplans/mod_dialplan_directory
+event_handlers/mod_zeroconf
diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index 1b8f9a6179..90aae89640 100644
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -860,7 +860,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
 	int netfd;
 	int refresh;
 	struct iax_event *iaxevent = NULL;
-
+	switch_event *s_event;
 	load_config();
 
 	if (globals.debug) {
@@ -877,6 +877,12 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
 
 	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "IAX Ready Port %d\n", globals.port);
 
+	if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
+		switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_iax2._udp");
+		switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", globals.port);
+		switch_event_fire(&s_event);
+	}
+
 	for (;;) {
 
 		if (running == -1) {
diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index d11969509f..db6c41b3f6 100644
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -862,7 +862,7 @@ static void *pri_thread_run(switch_thread *thread, void *obj)
 {
 	struct sangoma_pri *spri = obj;
 	struct channel_map chanmap;
-
+	switch_event *s_event;
 	SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANY, on_anything);
 	SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RING, on_ring);
 	SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_ringing);
@@ -874,6 +874,12 @@ static void *pri_thread_run(switch_thread *thread, void *obj)
 
 	spri->on_loop = check_flags;
 	spri->private = &chanmap;
+
+	if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
+		switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_pri._tcp");
+		switch_event_fire(&s_event);
+	}
+
 	sangoma_run_pri(spri);
 
 	free(spri);