diff --git a/Makefile.am b/Makefile.am
index d6ea4b4f8e..580f931c69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ NAME=freeswitch
 PREFIX=$(prefix)/${NAME}
 APR_CONFIG=$(prefix)/bin/apr-1-config
 AM_CFLAGS  = $(shell $(APR_CONFIG) --cflags --cppflags --includes)
-
+SOLINK=-shared -Xlinker -x
 AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) 
 OSARCH=$(shell uname -s)
 
@@ -77,10 +77,10 @@ freeswitch_LDFLAGS = -static -lfreeswitch
 
 modules: $(NAME)
 	@echo making modules
-	@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
 
 modclean:
-	@cd src/mod && for i in [a-z]* ; do echo making clean $$i ; CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" make -f $(PWD)/generic_mod.mk -C $$i clean || exit 1; done
+	@cd src/mod && for i in [a-z]* ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" make -f $(PWD)/generic_mod.mk -C $$i clean || exit 1; done
 
 
 install_mod:
diff --git a/Makefile.in b/Makefile.in
index 6931eabf49..6aa1d92193 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -228,6 +228,7 @@ AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
 	-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
 	-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
 	-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\"
+SOLINK = -shared -Xlinker -x
 AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(am__append_1) \
 	-L$(PREFIX)/lib
 OSARCH = $(shell uname -s)
@@ -934,10 +935,10 @@ uninstall-info: uninstall-info-recursive
 
 modules: $(NAME)
 	@echo making modules
-	@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
 
 modclean:
-	@cd src/mod && for i in [a-z]* ; do echo making clean $$i ; CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" make -f $(PWD)/generic_mod.mk -C $$i clean || exit 1; done
+	@cd src/mod && for i in [a-z]* ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" make -f $(PWD)/generic_mod.mk -C $$i clean || exit 1; done
 
 install_mod:
 	@echo Installing $(NAME)
diff --git a/generic_mod.Linux.mk b/generic_mod.mk
similarity index 65%
rename from generic_mod.Linux.mk
rename to generic_mod.mk
index e0ac7124f1..5761711588 100644
--- a/generic_mod.Linux.mk
+++ b/generic_mod.mk
@@ -1,7 +1,7 @@
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) -shared -Xlinker -x $(MOD).o -o $(MOD).so $(LDFLAGS)
+	$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS)
 
 all:	$(MOD).so
 
diff --git a/modmake.sh b/modmake.sh
index a56b16b5c5..8b582feb75 100755
--- a/modmake.sh
+++ b/modmake.sh
@@ -13,6 +13,6 @@ fi
 if [ -f $mod/Makefile ] ; then
 $make -C $mod
 else 
-$make -f $pwd/generic_mod.`uname -s`.mk -C $mod
+$make -f $pwd/generic_mod.mk -C $mod
 fi
 
diff --git a/src/mod/mod_codec_g729/Makefile b/src/mod/mod_codec_g729/Makefile
index 7f735430e3..07c49b7677 100644
--- a/src/mod/mod_codec_g729/Makefile
+++ b/src/mod/mod_codec_g729/Makefile
@@ -3,7 +3,7 @@ LDFLAGS +=-lg729
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) -shared -Xlinker -x $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
+	$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
 
 all:	$(MOD).so
 
diff --git a/src/mod/mod_exosip/Makefile b/src/mod/mod_exosip/Makefile
index 8664721ef6..92356a29c6 100644
--- a/src/mod/mod_exosip/Makefile
+++ b/src/mod/mod_exosip/Makefile
@@ -3,7 +3,7 @@ LDFLAGS += -leXosip2  -ljrtp4c
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) -shared -Xlinker -x -o $(MOD).so  $(MOD).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
 
 all:	$(MOD).so
 
diff --git a/src/mod/mod_g711codec/Makefile b/src/mod/mod_g711codec/Makefile
index a3f45ca6e1..60ab1c465c 100644
--- a/src/mod/mod_g711codec/Makefile
+++ b/src/mod/mod_g711codec/Makefile
@@ -6,7 +6,7 @@ g711.o: g711.c g711.h
 
 $(MOD).so: $(MOD).c g711.o
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) -shared -Xlinker -x g711.o $(MOD).o -o $(MOD).so $(LDFLAGS)
+	$(CC) $(SOLINK) g711.o $(MOD).o -o $(MOD).so $(LDFLAGS)
 
 
 
diff --git a/src/mod/mod_iaxchan/Makefile b/src/mod/mod_iaxchan/Makefile
index 0053431b4e..03a62463ca 100644
--- a/src/mod/mod_iaxchan/Makefile
+++ b/src/mod/mod_iaxchan/Makefile
@@ -2,7 +2,7 @@ LDFLAGS += -liax -L/usr/local/lib
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) -shared -Xlinker -x -o $(MOD).so  $(MOD).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
 
 all:	$(MOD).so
 
diff --git a/src/mod/mod_opalchan/Makefile b/src/mod/mod_opalchan/Makefile
index 5360e5537a..6064c58c9a 100644
--- a/src/mod/mod_opalchan/Makefile
+++ b/src/mod/mod_opalchan/Makefile
@@ -3,7 +3,7 @@ LDFLAGS += -liax
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) -shared -Xlinker -x -o $(MOD).so  $(MOD).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
 
 all:	$(MOD).so
 
diff --git a/src/mod/mod_portaudio/Makefile b/src/mod/mod_portaudio/Makefile
index 6a9cbb241b..090dfee9c1 100644
--- a/src/mod/mod_portaudio/Makefile
+++ b/src/mod/mod_portaudio/Makefile
@@ -2,7 +2,7 @@ LDFLAGS += -lportaudio -L/usr/local/lib
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) -shared -Xlinker -x -o $(MOD).so  $(MOD).o $(LDFLAGS)
+	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
 
 all:	$(MOD).so
 
diff --git a/src/mod/mod_speexcodec/Makefile b/src/mod/mod_speexcodec/Makefile
index 3838fd72d8..4a17cd5404 100644
--- a/src/mod/mod_speexcodec/Makefile
+++ b/src/mod/mod_speexcodec/Makefile
@@ -1,7 +1,7 @@
 
 $(MOD).so: $(MOD).c
 	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) -shared -Xlinker -x $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
+	$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
 
 all:	$(MOD).so