diff --git a/configure.ac b/configure.ac
index 6fc5c51154..759793970c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -438,6 +438,11 @@ if test "x${enable_fcgi}" = xyes ; then
 dnl m4/boinc_check_fcgi.m4
 BOINC_CHECK_FCGI
 fi
+dnl ---------- SSL (m4/check_ssl.m4)
+if [[ "x${enable_client}" = "xyes" -o "x${enable_server}" = "xyes" ]]
+then
+    CHECK_SSL
+fi
 
 dnl ---------- libcurl (m4/libcurl.m4) ------------------------------
 dnl curl is needed for libraries and those are needed by everything else
@@ -469,16 +474,11 @@ else
       echo "CURL_LIB_PATHS = ${CURL_LIB_PATHS}"
       echo "LDFLAGS = ${LDFLAGS}"
    fi
-      BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${LIBCURL}"
+   BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${LIBCURL}"
 fi
 
-dnl ---------- SSL (m4/check_ssl.m4)
-if [[ "x${enable_client}" = "xyes" -o "x${enable_server}" = "xyes" ]]
-then
-    CHECK_SSL
-    if test "x${found_ssl}" = "xyes"; then
-       BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
-    fi
+if test "x${found_ssl}" = "xyes"; then
+   BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
 fi
 
 dnl save the libs, since SAH_CHECK_LIB() will change them
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index 60657a9a3f..555f3c8de4 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -70,7 +70,6 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
      fi
 
      AC_PATH_PROG([_libcurl_config],[curl-config])
-
      if test x$_libcurl_config != "x" ; then
         AC_CACHE_CHECK([for the version of libcurl],
 	   [libcurl_cv_lib_curl_version],
@@ -107,6 +106,10 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
            if test x"$LIBCURL" = "x" ; then
               LIBCURL="`$_libcurl_config --libs`"
 
+              if test "x`echo \""$LIBCURL"\" | grep ssl`" = x ; then
+                LIBCURL="${LIBCURL} ${SSL_LIBS}"
+              fi
+
               # This is so silly, but Apple actually has a bug in their
 	      # curl-config script.  Fixed in Tiger, but there are still
 	      # lots of Panther installs around.