diff --git a/Makefile.am b/Makefile.am
index ef75f31d21..945b2f5cde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,6 +171,7 @@ modclean:
 	@rm -f build/freeswitch.env
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
+	@./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
 	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
 	@rm -f build/freeswitch.env
 
diff --git a/Makefile.in b/Makefile.in
index 4eca7a21c3..4785ec01cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1051,6 +1051,7 @@ modclean:
 	@rm -f build/freeswitch.env
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
+	@./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
 	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
 	@rm -f build/freeswitch.env
 
diff --git a/generic_mod.mk b/generic_mod.mk
index e1527cb63b..4264e434e5 100644
--- a/generic_mod.mk
+++ b/generic_mod.mk
@@ -1,11 +1,11 @@
-all:	$(MODNAME).so
+all:	$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/asr_tts/mod_cepstral/Makefile b/src/mod/asr_tts/mod_cepstral/Makefile
index f156bc038d..bee7196d14 100644
--- a/src/mod/asr_tts/mod_cepstral/Makefile
+++ b/src/mod/asr_tts/mod_cepstral/Makefile
@@ -8,16 +8,16 @@ endif
 
 LINKER=$(CC)
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/codecs/mod_g711/Makefile b/src/mod/codecs/mod_g711/Makefile
index c9a134efb5..56f2df4f3a 100644
--- a/src/mod/codecs/mod_g711/Makefile
+++ b/src/mod/codecs/mod_g711/Makefile
@@ -1,18 +1,18 @@
 
-all:	$(MODNAME).so
+all:	$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 g711.o: g711.c g711.h
 	$(CC) $(CFLAGS) -c -O2 -pthread -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE g711.c -o g711.o
 
-$(MODNAME).so: $(MODNAME).c g711.o
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c g711.o
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-	$(CC) $(SOLINK) g711.o $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
+	$(CC) $(SOLINK) g711.o $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
 
 
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
 
diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index 41f9ed7fe7..049315f71c 100644
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -1,17 +1,17 @@
 CFLAGS += -I$(PREFIX)/include/g729
 LDFLAGS +=-lg729
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/codecs/mod_gsm/Makefile b/src/mod/codecs/mod_gsm/Makefile
index ecde72dba7..0ee2964f5a 100644
--- a/src/mod/codecs/mod_gsm/Makefile
+++ b/src/mod/codecs/mod_gsm/Makefile
@@ -1,16 +1,16 @@
 LDFLAGS +=-lgsm
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile
index d0bb991cb6..0b522b54ce 100644
--- a/src/mod/codecs/mod_ilbc/Makefile
+++ b/src/mod/codecs/mod_ilbc/Makefile
@@ -1,16 +1,16 @@
 LDFLAGS +=-lilbc
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile
index 48a0222b43..60a7c51cf8 100644
--- a/src/mod/codecs/mod_speex/Makefile
+++ b/src/mod/codecs/mod_speex/Makefile
@@ -1,14 +1,14 @@
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS) -lspeex
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) -lspeex
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/dialplans/mod_pcre/Makefile b/src/mod/dialplans/mod_pcre/Makefile
index 14ab852215..8a769aa0ad 100644
--- a/src/mod/dialplans/mod_pcre/Makefile
+++ b/src/mod/dialplans/mod_pcre/Makefile
@@ -1,17 +1,17 @@
 LDFLAGS += -lpcre -L/usr/local/lib
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile
index 50ded147e9..40b9f43a24 100644
--- a/src/mod/directories/mod_ldap/Makefile
+++ b/src/mod/directories/mod_ldap/Makefile
@@ -4,17 +4,17 @@ LDFLAGS += -lldap_r -llber
 LINKER=$(CC)
 
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/endpoints/mod_exosip/Makefile b/src/mod/endpoints/mod_exosip/Makefile
index 1ccf2e3f00..9823dd718a 100644
--- a/src/mod/endpoints/mod_exosip/Makefile
+++ b/src/mod/endpoints/mod_exosip/Makefile
@@ -7,7 +7,7 @@ else
 	LINKER=$(CC)
 endif
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
@@ -15,12 +15,12 @@ depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
 
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/endpoints/mod_iax/Makefile b/src/mod/endpoints/mod_iax/Makefile
index 33feebad9e..03e67d1f42 100644
--- a/src/mod/endpoints/mod_iax/Makefile
+++ b/src/mod/endpoints/mod_iax/Makefile
@@ -1,17 +1,17 @@
 LDFLAGS += -liax -L/usr/local/lib
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/endpoints/mod_opal/Makefile b/src/mod/endpoints/mod_opal/Makefile
index ccade4f3b5..5ed6379634 100644
--- a/src/mod/endpoints/mod_opal/Makefile
+++ b/src/mod/endpoints/mod_opal/Makefile
@@ -1,14 +1,14 @@
 #CFLAGS += -I/usr/src/common/src
 LDFLAGS += -liax
 
-all:	$(MODNAME).so
+all:	$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/endpoints/mod_portaudio/Makefile b/src/mod/endpoints/mod_portaudio/Makefile
index a46332cdb2..3f5b60e0b7 100644
--- a/src/mod/endpoints/mod_portaudio/Makefile
+++ b/src/mod/endpoints/mod_portaudio/Makefile
@@ -1,21 +1,21 @@
 LDFLAGS += -lportaudio -L/usr/local/lib
 MYOBJS = pablio.o ringbuffer.o
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
 %.o:  %.c
 	$(CC) -fPIC $(CFLAGS) -c -o $@ $<
 
-$(MODNAME).so: $(MODNAME).c $(MYOBJS)
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MYOBJS)
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(CC) $(SOLINK) -o $(MODNAME).so $(MODNAME).o $(MYOBJS) $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(MYOBJS) $(LDFLAGS)
 
 
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/endpoints/mod_wanpipe/Makefile b/src/mod/endpoints/mod_wanpipe/Makefile
index 98d2034c8d..0b9b876b52 100644
--- a/src/mod/endpoints/mod_wanpipe/Makefile
+++ b/src/mod/endpoints/mod_wanpipe/Makefile
@@ -9,16 +9,16 @@ else
 	LINKER=$(CC)
 endif
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/event_handlers/mod_xmpp_event/Makefile b/src/mod/event_handlers/mod_xmpp_event/Makefile
index 7716982650..87c84d1a8b 100644
--- a/src/mod/event_handlers/mod_xmpp_event/Makefile
+++ b/src/mod/event_handlers/mod_xmpp_event/Makefile
@@ -1,16 +1,16 @@
 LDFLAGS += -liksemel -L/usr/local/lib
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/event_handlers/mod_zeroconf/Makefile b/src/mod/event_handlers/mod_zeroconf/Makefile
index cca46234bc..36cf613ada 100644
--- a/src/mod/event_handlers/mod_zeroconf/Makefile
+++ b/src/mod/event_handlers/mod_zeroconf/Makefile
@@ -3,17 +3,17 @@ CFLAGS += -I$(PREFIX)/include/howl
 LINKER=$(CC)
 
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	$(BASE)/build/buildlib.sh $(BASE) install howl-1.0.0.tar.gz --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index 1eb595d036..ae04687902 100644
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@@ -1,19 +1,19 @@
 LDFLAGS += -lsndfile -L/usr/local/lib
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
 
 
diff --git a/src/mod/languages/mod_perl/Makefile b/src/mod/languages/mod_perl/Makefile
index ab56dae001..aeaabaefba 100644
--- a/src/mod/languages/mod_perl/Makefile
+++ b/src/mod/languages/mod_perl/Makefile
@@ -9,7 +9,7 @@ OBJS += perlxsi.o
 
 
 
-all:	depends $(MODNAME).so fs_perl.$(DYNAMIC_LIB_EXTEN)
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) fs_perl.$(DYNAMIC_LIB_EXTEN)
 
 .perlok:
 	@(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
@@ -32,18 +32,18 @@ switch_swig_wrap.o: switch_swig_wrap.c
 	$(CC) -w $(CFLAGS) -fPIC -c $< -o $@
 
 
-fs_perl.$(DYNAMIC_LIB_EXTEN): $(MODNAME).so switch_swig_wrap.o switch_swig.o perlxsi.o
+fs_perl.$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o perlxsi.o
 	$(CC) $(SOLINK) -o fs_perl.$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o perlxsi.o $(LDFLAGS)
 
 
-$(MODNAME).so: $(MODNAME).c $(MODNAME).o $(OBJS)
-	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(OBJS) $(LDFLAGS)
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS)
+	$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 clean:
-	rm -fr *.dylib *.so *.o *~ perlxsi.c .perlok
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ perlxsi.c .perlok
 
 install:
 	mkdir -p $(PREFIX)/perl
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
 	cp -f fs_perl.$(DYNAMIC_LIB_EXTEN) fs_perl.pm $(PREFIX)/perl
 	if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then cp -f freeswitch.pm $(PREFIX)/perl ; fi
diff --git a/src/mod/languages/mod_spidermonkey/Makefile b/src/mod/languages/mod_spidermonkey/Makefile
index 01501f0ad9..a310e7500a 100644
--- a/src/mod/languages/mod_spidermonkey/Makefile
+++ b/src/mod/languages/mod_spidermonkey/Makefile
@@ -65,18 +65,18 @@ OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ/libjs.a $(BASE)/libs/mozil
 LINKER=$(CC)
 
 
-all:	depends $(MODNAME).so
+all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX)
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX)
 
-$(MODNAME).so: $(MODNAME).c
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(OBJS) $(LDFLAGS)
+	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 clean:
-	rm -fr *.so *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-	cp -f $(MODNAME).so $(PREFIX)/mod
+	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index f1e15a4b11..82d19cfa78 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -188,6 +188,8 @@ static void process_module_file(char *dir, char *fname)
 
 #ifdef WIN32
 	const char *ext = ".dll";
+#elif defined (MACOSX) || defined (DARWIN)
+	const char *ext = ".dylib";
 #else
 	const char *ext = ".so";
 #endif
@@ -201,11 +203,11 @@ static void process_module_file(char *dir, char *fname)
 		path = switch_core_strdup(loadable_modules.pool, file);
 	} else {
 		if (strchr(file, '.')) {
-			len = strlen(dir) + strlen(file) + 3;
+			len = strlen(dir) + strlen(file) + 4;
 			path = (char *) switch_core_alloc(loadable_modules.pool, len);
 			snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file);
 		} else {
-			len = strlen(dir) + strlen(file) + 7;
+			len = strlen(dir) + strlen(file) + 8;
 			path = (char *) switch_core_alloc(loadable_modules.pool, len);
 			snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext);
 		}
@@ -324,6 +326,9 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
 #ifdef WIN32
 	const char *ext = ".dll";
 	const char *EXT = ".DLL";
+#elif defined (MACOSX) || defined (DARWIN)
+	const char *ext = ".dylib";
+	const char *EXT = ".DYLIB";
 #else
 	const char *ext = ".so";
 	const char *EXT = ".SO";