diff --git a/ChangeLog b/ChangeLog
index da790493..ef6c4bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-11  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+	* configure.ac: Do not hardcode GNU TLS and OpenSSL libraries.
+
 	* bootstrap.conf (gnulib_modules): Include module iconv.
 
 	* configure.ac: Allow --with-libgnutls-prefix and
diff --git a/configure.ac b/configure.ac
index 45445fa3..b9ccbfef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
     then
       AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
       AC_LIBOBJ([openssl])
-      LIBS="-lopenssl $LIBS"
+      LIBS="$LIBSSL $LIBS"
     elif test x"$with_ssl" != x
     then
       AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
@@ -303,7 +303,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
   then
     AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
     AC_LIBOBJ([gnutls])
-    LIBS="-lgnutls $LIBS"
+    LIBS="$LIBGNUTLS $LIBS"
   else
     AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
   fi