diff --git a/configure.ac b/configure.ac
index 1783625d..ab4af4fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,14 +61,16 @@ if test -n "${_OPENSSLDIR}" && test -d "${_OPENSSLDIR}"; then
   DYLD_LIBRARY_PATH="${_OPENSSLDIR}/lib:${DYLD_LIBRARY_PATH}"
 fi
 
-PKG_CHECK_MODULES([OPENSSL],
+PKG_CHECK_MODULES([OpenSSL],
    [libcrypto >= 0.9.8], [ ],
    [
-     OPENSSL_LIBS=" -lcrypto ";
-     AC_MSG_WARN([OpenSSL pkg-config failed, using fallback defaults (${OPENSSL_LIBS})]);
+     OpenSSL_LIBS=" -lcrypto ";
+     AC_MSG_WARN([OpenSSL pkg-config failed, using fallback defaults (${OpenSSL_LIBS})]);
    ]
 )
 
+OPENSSL_LIBS="$OpenSSL_LIBS"
+OPENSSL_CFLAGS="$OpenSSL_CFLAGS"
 
 # Detect the Qt libraries and header
 ####################################
@@ -84,6 +86,7 @@ AC_ARG_WITH([qt],
 if test -n "${_QTDIR}" && test -d "${_QTDIR}"; then
   _QTDIR=`cd ${_QTDIR} && pwd`
   PKG_CONFIG_PATH="${_QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+  LD_LIBRARY_PATH="${_QTDIR}/lib:${LD_LIBRARY_PATH}"
   DYLD_LIBRARY_PATH="${_QTDIR}/lib:${DYLD_LIBRARY_PATH}"
 fi
 
@@ -128,16 +131,27 @@ fi
 if test "x${QT_UIC}" = "x"; then
   QT_UIC="`which uic-qt${QT_VERSION} || which uic`"
 fi
-QT_LRELEASE=`echo ${QT_MOC} | sed 's/moc/lrelease/'`
+
+# Add the location of 'moc' to $PATH
+QT_BIN_PATH="`dirname ${QT_MOC}`:$PATH"
+
+AC_PATH_PROG([QT_LRELEASEQT], [lrelease-qt${QT_VERSION}], , [$QT_BIN_PATH])
+if test "x${QT_LRELEASEQT}" = "x"; then
+  AC_PATH_PROG([QT_LRELEASE], [lrelease], [lrelease], [$QT_BIN_PATH])
+else
+  QT_LRELEASE="$QT_LRELEASEQT"
+fi
+
+AC_PATH_PROG([QT_RCCQT], [rcc-qt${QT_VERSION}], , [$QT_BIN_PATH])
+if test "x${QT_RCCQT}" = "x"; then
+  AC_PATH_PROG([QT_RCC], [rcc], [rcc], [$QT_BIN_PATH])
+else
+  QT_RCC="$QT_RCCQT"
+fi
+
+
 if test -n "$DARWIN"; then
-  MACDEPLOYQT=`echo ${QT_MOC} | sed 's/moc/macdeployqt/'`
-fi
-QT_RCC=`echo ${QT_MOC} | sed 's/moc/rcc/'`
-if ! test -x ${QT_RCC}; then
-  QT_RCC=`echo ${QT_MOC} | sed 's/moc.*/rcc/'`
-fi
-if ! test -x ${QT_RCC}; then
-  QT_RCC="`which rcc-qt${QT_VERSION} || which rcc`"
+  AC_PATH_PROG([MACDEPLOYQT], [macdeployqt], [macdeployqt], [$QT_BIN_PATH])
 fi
 
 AC_SUBST([QT_MOC])
diff --git a/m4/xca_compile_test.m4 b/m4/xca_compile_test.m4
index 607570a3..4a550063 100644
--- a/m4/xca_compile_test.m4
+++ b/m4/xca_compile_test.m4
@@ -8,6 +8,7 @@ LIBS="${LIBS} ${OPENSSL_LIBS}${QT_LIBS}"
 AC_TRY_RUN([
 #include <stdio.h>
 #include <string.h>
+#include <ltdl.h>
 #include <openssl/opensslv.h>
 #include <openssl/opensslconf.h>
 #include <openssl/crypto.h>
@@ -17,6 +18,7 @@ AC_TRY_RUN([
 #define WARN C"###################### WARNING ######################\n"
 int main(){
   char buf[2048] = "";
+  int r = lt_dlinit();
   printf(C"The Versions of the used libraries are:\n"
         C"Header:\n"
         C"\t%s 0x%lxL\n"
@@ -33,6 +35,8 @@ int main(){
         strcat(buf, C"The versions of the QT headers and library differ\n");
   if (strcmp(OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION)))
         strcat(buf, C"The versions of the OpenSSL headers and library differ\n");
+  if (r)
+	strcat(buf, C"lt_dlinit() returned != 0\n");
 #ifdef OPENSSL_NO_EC
   strcat(buf, C"This OpenSSL installation has no EC cryptography support\n");
 #else