diff --git a/configure.ac b/configure.ac
index 3fc5a34f29..508246d523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AC_PROG_LN_S
+SAH_LINKS
 
 dnl enable objective-C 
 _AM_DEPENDENCIES([OBJC])
@@ -237,7 +237,7 @@ dnl please add it to the lists below...
 case ${target} in
 	*-linux*)	STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl"
 	;;
-	*-solaris*)	STATIC_LIB_LIST="${STATIC_LIB_LIST} X* openssl"
+	*-solaris*)	STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto"
 	;;
 esac
 
@@ -255,11 +255,11 @@ SAH_CHECK_LIB([socket], [bind],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
 SAH_CHECK_LIB([z], [gzopen], 
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-SAH_CHECK_LIB([crypto], [RSA_new], 
-    [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
 CHECK_SSL
-SAH_CHECK_LIB([openssl], [main],
-    [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} -L${SSLDIR} ${sah_lib_last}"])
+SAH_CHECK_LIB([crypto], [RSA_new], 
+    [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} -L${SSLDIR}/lib ${sah_lib_last}"])
+SAH_CHECK_LIB([ssl], [main],
+    [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} -L${SSLDIR}/lib ${sah_lib_last}"])
 LIBS=${SAVELIBS_AAF}
 
 dnl check for pthread