diff --git a/ChangeLog b/ChangeLog
index bfedde7..030cc02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 TBA
 	- SCRAM-SHA-1 authentication mechanism
+	- pkg-config support
 
 0.8.5
 	- libtoolize to generate .so
diff --git a/configure.ac b/configure.ac
index e3b9a0a..8a8bca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,9 +77,10 @@ AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser])
 AC_SEARCH_LIBS([socket], [socket])
 
 if test "x$PLATFORM" != xfreebsd; then
-        AC_CHECK_LIB([resolv], [res_query], [LIBS="-lresolv $LIBS"; PC_LIBS+=(-lresolv)],
-            [AC_CHECK_LIB([resolv], [__res_query], [LIBS="-lresolv $LIBS"; PC_LIBS+=(-lresolv)],
-                [AC_MSG_ERROR([libresolv not found; libresolv required. ])])])
+        AC_CHECK_LIB([resolv], [res_query], [],
+            [AC_CHECK_LIB([resolv], [__res_query], [],
+                [AC_MSG_ERROR([libresolv not found; libresolv required.])])])
+        PC_LIBS+=(-lresolv)
 else
         AC_MSG_NOTICE([skipping libresolv checks for freebsd])
 fi