diff --git a/Makefile.am b/Makefile.am
index 91d949b359..21b83bad2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,7 @@ endif
 
 if HAVE_LIBEDIT
 CORE_CFLAGS += -I$(switch_srcdir)/libs/libedit/src -DSWITCH_HAVE_LIBEDIT
-CORE_LIBS   += libs/libedit/src/.libs/libedit.a
+CORE_LIBS   += libs/libedit/src/.libs/libedit.a $(TINFO_LIBS)
 endif
 
 if ENABLE_TIMERFD_WRAPPER
@@ -324,7 +324,7 @@ fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) -lm
 
 if HAVE_LIBEDIT
 fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(switch_srcdir)/libs/libedit/src
-fs_cli_LDADD   = libs/libedit/src/.libs/libedit.a
+fs_cli_LDADD   = libs/libedit/src/.libs/libedit.a $(TINFO_LIBS)
 endif
 
 
@@ -373,7 +373,7 @@ freeswitch_LDADD   = libfreeswitch.la libs/apr/libapr-1.la
 
 if HAVE_LIBEDIT
 freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
-freeswitch_LDADD  += libs/libedit/src/.libs/libedit.a
+freeswitch_LDADD  += libs/libedit/src/.libs/libedit.a $(TINFO_LIBS)
 endif
 
 if HAVE_ODBC
diff --git a/configure.in b/configure.in
index ed8c361eac..da0a8bd559 100644
--- a/configure.in
+++ b/configure.in
@@ -464,6 +464,12 @@ SPANDSP_LA_JBIG="-ljbig"
 AC_SUBST(SPANDSP_LA_JBIG)
 fi
 
+AC_CHECK_LIB(lzma, lzma_code, have_liblzma=yes, have_liblzma=no)
+if test "x$have_liblzma" = "xyes" ; then
+SPANDSP_LA_LZMA="-llzma"
+AC_SUBST(SPANDSP_LA_LZMA)
+fi
+
 AC_CHECK_LIB(resolv, res_init, have_libresolv=yes, have_libresolv=no)
 if test "x$have_libresolv" = "xyes"  ; then
 APR_ADDTO(SWITCH_AM_LDFLAGS, -lresolv)
@@ -951,9 +957,16 @@ AC_ARG_ENABLE(core-libedit-support,
 	[AS_HELP_STRING([--disable-core-libedit-support], [Compile without libedit Support])], [enable_core_libedit_support="$enableval"], [enable_core_libedit_support="yes"])
 
 if test "$enable_core_libedit_support" = "yes" ; then
-    AC_CHECK_LIB(ncurses, tgetent,,
-       [AC_CHECK_LIB(curses, tgetent,,
-          [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
+    AC_CHECK_LIB(tinfo, tgetent, [have_libtinfo="yes"], [have_libtinfo="no"])
+    if test "$have_libtinfo" == "yes" ; then
+       TINFO_LIBS="-ltinfo"
+    else
+       TINFO_LIBS=""
+       AC_CHECK_LIB(ncurses, tgetent,,
+          [AC_CHECK_LIB(curses, tgetent,,
+	     [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
+    fi
+    AC_SUBST(TINFO_LIBS)
 fi
 
 SAC_OPENSSL
@@ -1125,6 +1138,7 @@ AC_CONFIG_FILES([Makefile
 		build/getg729.sh
 		build/freeswitch.pc
 		build/modmake.rules
+                libs/esl/eslmake.rules
 		libs/xmlrpc-c/xmlrpc_config.h
 		libs/xmlrpc-c/config.mk
 		libs/xmlrpc-c/srcdir.mk
diff --git a/libs/esl/Makefile b/libs/esl/Makefile
index 746f730124..727bf3169f 100644
--- a/libs/esl/Makefile
+++ b/libs/esl/Makefile
@@ -1,3 +1,4 @@
+include eslmake.rules
 PWD=$(shell pwd)
 INCS=-I$(PWD)/src/include
 LIBEDIT_DIR=../../libs/libedit
@@ -7,7 +8,7 @@ PICKY=-O2
 CFLAGS=$(BASE_FLAGS) $(PICKY)
 CXXFLAGS=$(BASE_FLAGS)
 MYLIB=libesl.a
-LIBS=-lncurses -lesl -lpthread -lm
+LIBS=-lncurses -lesl -lpthread -lm $(TINFO_LIBS)
 LDFLAGS=-L.
 OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o src/esl_json.o src/esl_buffer.o
 SRC=src/esl.c src/esl_json.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c src/esl_oop.cpp src/esl_json.c src/esl_buffer.c
diff --git a/libs/esl/eslmake.rules.in b/libs/esl/eslmake.rules.in
new file mode 100644
index 0000000000..0a1fe7f624
--- /dev/null
+++ b/libs/esl/eslmake.rules.in
@@ -0,0 +1,2 @@
+TINFO_LIBS=@TINFO_LIBS@
+
diff --git a/libs/libedit/configure.ac b/libs/libedit/configure.ac
index 5bf51d28cf..207bb0f118 100644
--- a/libs/libedit/configure.ac
+++ b/libs/libedit/configure.ac
@@ -27,9 +27,16 @@ AC_PROG_LN_S
 AC_PROG_AWK
 EL_MANTYPE
 
-AC_CHECK_LIB(curses, tgetent,,
-   [AC_CHECK_LIB(ncurses, tgetent,,
-      [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
+AC_CHECK_LIB(tinfo, tgetent, [have_libtinfo="yes"], [have_libtinfo="no"])
+if test "$have_libtinfo" == "yes" ; then
+   TINFO_LIBS="-ltinfo"
+else
+   TINFO_LIBS=""
+   AC_CHECK_LIB(ncurses, tgetent,,
+      [AC_CHECK_LIB(curses, tgetent,,
+         [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
+fi
+AC_SUBST(TINFO_LIBS)
 
 # Checks for header files.
 AC_FUNC_ALLOCA
diff --git a/libs/libedit/examples/Makefile.am b/libs/libedit/examples/Makefile.am
index 01f1e9c7eb..ef7e032b9f 100644
--- a/libs/libedit/examples/Makefile.am
+++ b/libs/libedit/examples/Makefile.am
@@ -1,5 +1,5 @@
 
-LDADD = $(top_builddir)/src/libedit.la
+LDADD = $(top_builddir)/src/libedit.la $(TINFO_LIBS)
 AM_CFLAGS = -I$(top_srcdir)/src
 
 noinst_PROGRAMS    = test fileman
diff --git a/libs/libedit/libedit.pc.in b/libs/libedit/libedit.pc.in
index 4e0f6ffece..ad879c74d6 100644
--- a/libs/libedit/libedit.pc.in
+++ b/libs/libedit/libedit.pc.in
@@ -7,6 +7,6 @@ Name: libedit
 Description: command line editor library provides generic line editing, history, and tokenization functions.
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -ledit -lcurses
+Libs: -L${libdir} -ledit -lcurses @TINFO_LIBS@
 Cflags: -I${includedir} -I${includedir}/editline
 
diff --git a/src/mod/applications/mod_spandsp/Makefile.am b/src/mod/applications/mod_spandsp/Makefile.am
index 98b781bd7d..0c78e46367 100644
--- a/src/mod/applications/mod_spandsp/Makefile.am
+++ b/src/mod/applications/mod_spandsp/Makefile.am
@@ -12,7 +12,7 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 mod_LTLIBRARIES = mod_spandsp.la
 mod_spandsp_la_SOURCES  = mod_spandsp.c udptl.c mod_spandsp_fax.c mod_spandsp_dsp.c mod_spandsp_codecs.c mod_spandsp_modem.c
 mod_spandsp_la_CFLAGS   = $(BUILD_CFLAGS) $(AM_CFLAGS) -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
-mod_spandsp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA) $(SPANDSP_LA_JBIG) -ljpeg -lz -lutil
+mod_spandsp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA) $(SPANDSP_LA_JBIG) $(SPANDSP_LA_LZMA) -ljpeg -lz -lutil
 mod_spandsp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
 $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update