diff --git a/Makefile.am b/Makefile.am
index 52c462e674..446de48453 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,7 +134,6 @@ freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
 if ADD_LIBEDIT
 CORE_CFLAGS    += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
 CORE_LIBS      += libs/libedit/src/.libs/libedit.a
-freeswitch_LDADD += -lcurses
 endif
 
 if ADD_ODBC
diff --git a/configure.in b/configure.in
index a084920cbc..9cd36b4801 100644
--- a/configure.in
+++ b/configure.in
@@ -393,6 +393,12 @@ AC_ARG_ENABLE(core-odbc-support,
 AC_ARG_ENABLE(core-libedit-support,     
 	[  --enable-core-libedit-support         Compile with libedit Support],,[enable_core_libedit_support="no"])
 
+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!])] )] )
+fi
+
 #AX_LIB_MYSQL([MINIMUM-VERSION]) 
 AX_LIB_MYSQL
 AX_CHECK_JAVA