diff --git a/configure.in b/configure.in
index c7c299bebb..3e29bcc28b 100644
--- a/configure.in
+++ b/configure.in
@@ -788,6 +788,7 @@ AC_CONFIG_FILES([Makefile
                 src/Makefile
                 src/mod/Makefile
                 src/mod/applications/mod_enum/Makefile
+		src/mod/applications/mod_expr/Makefile
                 src/mod/endpoints/mod_sofia/Makefile
                 src/mod/asr_tts/mod_unimrcp/Makefile
                 src/mod/languages/mod_java/Makefile
diff --git a/src/mod/applications/mod_expr/Makefile b/src/mod/applications/mod_expr/Makefile
deleted file mode 100644
index 3be4aaa718..0000000000
--- a/src/mod/applications/mod_expr/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-BASE=../../../..
-LOCAL_SOURCES=$(MODDIR)/expreval.c $(MODDIR)/exprinit.c $(MODDIR)/exprobj.c $(MODDIR)/exprutil.c $(MODDIR)/exprfunc.c $(MODDIR)/exprmem.c $(MODDIR)/exprpars.c $(MODDIR)/exprval.c
-LOCAL_OBJS=$(MODDIR)/expreval.o $(MODDIR)/exprinit.o $(MODDIR)/exprobj.o $(MODDIR)/exprutil.o $(MODDIR)/exprfunc.o $(MODDIR)/exprmem.o $(MODDIR)/exprpars.o $(MODDIR)/exprval.o
-LOCAL_LDFLAGS=-lm
-include $(BASE)/build/modmake.rules
-
diff --git a/src/mod/applications/mod_expr/Makefile.am b/src/mod/applications/mod_expr/Makefile.am
new file mode 100644
index 0000000000..c5915b55d0
--- /dev/null
+++ b/src/mod/applications/mod_expr/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_expr
+
+mod_LTLIBRARIES = mod_expr.la
+mod_expr_la_SOURCES  = mod_expr.c expreval.c exprinit.c exprobj.c exprutil.c exprfunc.c exprmem.c exprpars.c exprval.c
+mod_expr_la_CFLAGS   = $(AM_CFLAGS)
+mod_expr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_expr_la_LDFLAGS  = -avoid-version -module -no-undefined -lm