diff --git a/CHANGES b/CHANGES
index 7191f2ce3..83a74f1ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel Stenberg (25 Mar 2008)
+- Made setting the CURLOPT_SSL_CTX_FUNCTION option return a failure in case
+  libcurl wasn't built to use OpenSSL as that is a prerequisite for this
+  option to function!
+
 Daniel Stenberg (22 Mar 2008)
 - Fixed the problem with doing a zero byte SCP transfer, verified with test
   case 617 (which was added by Daniel Fandrich 5 Mar 2008).
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c34d38896..9a2ab6d8c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -51,6 +51,8 @@ This release includes the following bugfixes:
  o SFTP infinite loop when given an invalid quote command
  o curl-config erroneously reported LDAPS support with missing LDAP libraries
  o SCP infinite loop when downloading a zero byte file
+ o setting the CURLOPT_SSL_CTX_FUNCTION with libcurl built without OpenSSL
+   now makes curl_easy_setopt() properly return failure
 
 This release includes the following known bugs:
 
diff --git a/lib/url.c b/lib/url.c
index 6b07f2e82..1dc51d189 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1769,6 +1769,11 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
      */
     data->set.ssl.verifyhost = va_arg(param, long);
     break;
+#ifdef USE_SSLEAY
+    /* since these two options are only possible to use on an OpenSSL-
+       powered libcurl we #ifdef them on this condition so that libcurls
+       built against other SSL libs will return a proper error when trying
+       to set this option! */
   case CURLOPT_SSL_CTX_FUNCTION:
     /*
      * Set a SSL_CTX callback
@@ -1781,6 +1786,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
      */
     data->set.ssl.fsslctxp = va_arg(param, void *);
     break;
+#endif
   case CURLOPT_CAINFO:
     /*
      * Set CA info for SSL connection. Specify file name of the CA certificate