diff --git a/configure.in b/configure.in
index ca5fd93ec6..f9765ebc9d 100644
--- a/configure.in
+++ b/configure.in
@@ -793,6 +793,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/applications/mod_t38gateway/Makefile
 		src/mod/endpoints/mod_iax/Makefile
 		src/mod/endpoints/mod_portaudio/Makefile
+		src/mod/endpoints/mod_skypiax/Makefile
                 src/mod/endpoints/mod_sofia/Makefile
 		src/mod/formats/mod_portaudio_stream/Makefile
                 src/mod/asr_tts/mod_unimrcp/Makefile
diff --git a/src/mod/endpoints/mod_skypiax/Makefile b/src/mod/endpoints/mod_skypiax/Makefile
deleted file mode 100644
index fe7a9a46ab..0000000000
--- a/src/mod/endpoints/mod_skypiax/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-MODNAME=mod_skypiax
-SVNDEF := -D'SKYPIAX_SVN_VERSION="$(shell svnversion -n .)"'
-LOCAL_CFLAGS += $(SVNDEF)
-LOCAL_LDFLAGS=-lX11
-LOCAL_OBJS=skypiax_protocol.o
-include ../../../../build/modmake.rules
diff --git a/src/mod/endpoints/mod_skypiax/Makefile.am b/src/mod/endpoints/mod_skypiax/Makefile.am
new file mode 100644
index 0000000000..220c8f8c5f
--- /dev/null
+++ b/src/mod/endpoints/mod_skypiax/Makefile.am
@@ -0,0 +1,7 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_skypiax
+mod_LTLIBRARIES = mod_skypiax.la
+mod_skypiax_la_SOURCES  = mod_skypiax.c skypiax_protocol.c
+mod_skypiax_la_CFLAGS   = $(AM_CFLAGS) -DSKYPIAX_SVN_VERSION=\"`cat $(switch_builddir)/.version`\"
+mod_skypiax_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_skypiax_la_LDFLAGS  = -avoid-version -module -no-undefined -lX11