diff --git a/Makefile.am b/Makefile.am
index ffafc5bb86..f87764f2eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,7 +168,7 @@ fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_e
 freeswitch_SOURCES = src/switch.c
 nodist_freeswitch_SOURCES = src/include/switch_version.h
 fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include 
-fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread
+fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
 freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
 freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir)
 freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
diff --git a/configure.in b/configure.in
index da6ee48f7d..ae58753672 100644
--- a/configure.in
+++ b/configure.in
@@ -174,7 +174,7 @@ fi
 
 AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
 
-
+ESL_LDFLAGS=
 # tweak platform specific flags
 case "$host" in
     *darwin*)
@@ -183,6 +183,7 @@ case "$host" in
     ;;
     *-solaris2*)
         APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048)
+        APR_ADDTO(ESL_LDFLAGS, -lnsl)
     ;;
     *bsd*)
         APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include)
@@ -194,6 +195,7 @@ APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)
 AC_SUBST(SWITCH_AM_CFLAGS)
 AC_SUBST(SWITCH_AM_CXXFLAGS)
 AC_SUBST(SWITCH_AM_LDFLAGS)
+AC_SUBST(ESL_LDFLAGS)
 AC_SUBST(SOLINK)
 AC_SUBST(DYNAMIC_LIB_EXTEN)