diff --git a/common/Makefile.am b/common/Makefile.am
index 8305ede4..1bc5851f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -18,6 +18,8 @@ AM_CPPFLAGS = \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -DXRDP_LOG_PATH=\"${localstatedir}/log\"
 
+AM_CFLAGS = $(OPENSSL_CFLAGS)
+
 module_LTLIBRARIES = \
   libcommon.la
 
@@ -50,6 +52,6 @@ libcommon_la_SOURCES = \
   $(PIXMAN_SOURCES)
 
 libcommon_la_LIBADD = \
-  -lcrypto \
-  -lssl \
-  -lpthread
+  -lpthread \
+  $(OPENSSL_LIBS) \
+  $(DLOPEN_LIBS)
diff --git a/configure.ac b/configure.ac
index 94ba2e16..3b58f2de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,10 +118,15 @@ AC_ARG_ENABLE(pixman, AS_HELP_STRING([--enable-pixman],
               [], [enable_pixman=no])
 AM_CONDITIONAL(XRDP_PIXMAN, [test x$enable_pixman = xyes])
 
+# Check if -ldl is needed to use dlopen()
+DLOPEN_LIBS=
+AC_CHECK_FUNC(dlopen, [],
+              [AC_CHECK_LIB(dl, dlopen, [DLOPEN_LIBS=-ldl])])
+AC_SUBST(DLOPEN_LIBS)
+
 # checking for openssl
-AC_CHECK_HEADER([openssl/rc4.h], [],
-  [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
-  [#include <stdlib.h>])
+PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
+  [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
 
 # checking for pam variation
 # Linux-PAM is used in Linux systems