diff --git a/Makefile.am b/Makefile.am
index 4ed82b6f..08a7cafe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,7 +201,7 @@ libevent_extra_la_LDFLAGS = $(GENERIC_LDFLAGS)
 
 if OPENSSL
 libevent_openssl_la_SOURCES = bufferevent_openssl.c
-libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lssl -lcrypto
+libevent_openssl_la_LIBADD = $(MAYBE_CORE) $(OPENSSL_LIBS)
 libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS)
 endif
 
diff --git a/configure.in b/configure.in
index cca44425..017be83f 100644
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,7 @@ OPENSSL_LIBS=""
 have_openssl=no
 AC_SEARCH_LIBS([SSL_new], [ssl],
 		[have_openssl=yes
-	        OPENSSL_LIBS="$LIBS"
+		OPENSSL_LIBS="$LIBS -lcrypto"
 		AC_DEFINE(HAVE_OPENSSL, 1, [Define if the system has openssl])])
 LIBS="$save_LIBS"
 AC_SUBST(OPENSSL_LIBS)