diff --git a/configure.in b/configure.in
index 0e2770fe..31eabdb9 100644
--- a/configure.in
+++ b/configure.in
@@ -176,6 +176,7 @@ else
 fi
 AC_SUBST(EV_LIB_WS32)
 AC_SUBST(EV_LIB_GDI)
+AC_SUBST(OPENSSL_LIBADD)
 
 AC_SYS_LARGEFILE
 
diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4
index 7b273255..3cb064a0 100644
--- a/m4/libevent_openssl.m4
+++ b/m4/libevent_openssl.m4
@@ -13,7 +13,7 @@ case "$enable_openssl" in
 	OPENSSL_LIBS=`$PKG_CONFIG --libs openssl 2>/dev/null`
 	case "$OPENSSL_LIBS" in
 	 '') ;;
-	 *) OPENSSL_LIBS="$OPENSSL_LIBS $EV_LIB_GDI $EV_LIB_WS32"
+	 *) OPENSSL_LIBS="$OPENSSL_LIBS $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"
 	    have_openssl=yes
 	    ;;
 	esac
@@ -28,9 +28,9 @@ case "$enable_openssl" in
 	OPENSSL_LIBS=""
 	AC_SEARCH_LIBS([SSL_new], [ssl],
 	    [have_openssl=yes
-	    OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32"],
+	    OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"],
 	    [have_openssl=no],
-	    [-lcrypto $EV_LIB_GDI $EV_LIB_WS32])
+	    [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
 	LIBS="$save_LIBS"
 	;;
     esac
diff --git a/sample/Makefile.am b/sample/Makefile.am
index be7492b3..282d67b1 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -22,7 +22,7 @@ if OPENSSL
 AM_CPPFLAGS += $(OPENSSL_INCS)
 noinst_PROGRAMS += le-proxy
 le_proxy_SOURCES = le-proxy.c
-le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto
+le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
 endif
 
 verify:
diff --git a/test/Makefile.am b/test/Makefile.am
index 1beb51d8..b10c41a8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -65,7 +65,7 @@ regress_LDFLAGS = $(PTHREAD_CFLAGS)
 
 if OPENSSL
 regress_SOURCES += regress_ssl.c
-regress_LDADD += ../libevent_openssl.la -lssl -lcrypto
+regress_LDADD += ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD}
 endif
 
 bench_SOURCES = bench.c