diff --git a/Makefile.am b/Makefile.am
index 742137c..788d37c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,10 @@ CFLAGS = -g -Wall
 PARSER_CFLAGS=@PARSER_CFLAGS@
 PARSER_LIBS=@PARSER_LIBS@
 
+SSL_LIBS = -lssl -lcrypto -lz
+
 STROPHE_FLAGS = -I$(top_srcdir)
-STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) -lssl -lresolv
+STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) $(SSL_LIBS)
 
 ## Main build targets
 lib_LIBRARIES = libstrophe.a
diff --git a/configure.ac b/configure.ac
index ca7e53e..7b9797c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ fi
 
 AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser])
 AC_SEARCH_LIBS([socket], [socket])
+AC_SEARCH_LIBS([res_9_query], [resolv])
 
 AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
 AC_SUBST(PARSER_NAME)