diff --git a/CHANGES b/CHANGES
index 3bd22a5405d2c24fecb516f11576e59f3850f46a..e4890c5c8e61ef4e9ac7d3c652f78d273993a48e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,11 +7,18 @@
                                   Changelog
 
 Daniel (9 December 2004)
+- Ton Voon provided a configure fix that should fix the notorious (mostly
+  reported on Solaris) problem where the size_t check fails due to the SSL
+  libs being found in a dir not searched through by the run-time linker.
+  patch-tracker entry #1081707.
+
 - Bryan Henderson pointed out in bug report #1081788 that the curl-config
   --vernum output wasn't zero prefixed properly (as claimed in documentation).
   This is fixed in maketgz now.
   
 Daniel (8 December 2004)
+- Matt Veenstra updated the mach-O framework files for Mac OS X.
+
 - Rene Bernhardt found and fixed a buffer overrun in the NTLM code, where
   libcurl always and unconditionally overwrote a stack-based array with 3 zero
   bytes. This is not an exploitable buffer overflow. No need to get alarmed.
diff --git a/configure.ac b/configure.ac
index 7e2373c599f5cf7ecf4e17c76f9a5a52dbed203b..b204653d919f6e98a045975611b8a4d320ab3ff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -872,6 +872,12 @@ AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),
   if test X"$OPT_SSL" != Xoff &&
      test "$OPENSSL_ENABLED" != "1"; then
     AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])
+  elif test "$OPENSSL_ENABLED" = "1"; then
+    dnl when the ssl shared libs were found in a path that the run-time linker
+    dnl doesn't search through, we need to add it to LD_LIBRARY_PATH to
+    dnl prevent further configure tests to fail due to this
+    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SSL/lib$libsuff"
+    export LD_LIBRARY_PATH
   fi
 
 fi