diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
index cf6718b3882..c3a90d22f35 100644
--- a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
@@ -200,6 +200,9 @@ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
              -L$(NSCP_DISTDIR)/lib $(SVRCORE_LINK) \
 	     $(LDAPTOOLS_NSS_LINK) \
 	     -ldl -brtl -lpthreads -lc_r -lm
+ifndef HAVE_LIBNLS
+EXTRA_LIBS += -liconv
+endif
 EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
 endif