diff --git a/Makefile.am b/Makefile.am
index 3d948a80fb..50f05dcfa2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,7 +139,7 @@ endif
 
 if HAVE_LIBEDIT
 CORE_CFLAGS += -I$(switch_srcdir)/libs/libedit/src -DSWITCH_HAVE_LIBEDIT
-CORE_LIBS   += libs/libedit/src/.libs/libedit.a $(TINFO_LIBS)
+CORE_LIBS   += libs/libedit/src/.libs/libedit.a
 endif
 
 if ENABLE_TIMERFD_WRAPPER
@@ -159,6 +159,10 @@ libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDF
 libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(PLATFORM_CORE_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
 
+if HAVE_LIBEDIT
+libfreeswitch_la_LIBADD += $(TINFO_LIBS)
+endif
+
 if HAVE_ODBC
 libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
 endif