diff --git a/libs/curl/include/curl/curl.h b/libs/curl/include/curl/curl.h
index 056e6df745..04ba3d3e63 100644
--- a/libs/curl/include/curl/curl.h
+++ b/libs/curl/include/curl/curl.h
@@ -304,7 +304,8 @@ typedef enum {
   CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
   CURLE_FAILED_INIT,             /* 2 */
   CURLE_URL_MALFORMAT,           /* 3 */
-  CURLE_URL_MALFORMAT_USER,      /* 4 - NOT USED */
+  CURLE_NOT_BUILT_IN,            /* 4 - [was obsoleted in August 2007 for
+				    7.17.0, reused in April 2011 for 7.21.5] */
   CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
   CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
   CURLE_COULDNT_CONNECT,         /* 7 */
diff --git a/libs/curl/lib/ssluse.c b/libs/curl/lib/ssluse.c
index d7b2870c6b..dfbe7a7cf0 100644
--- a/libs/curl/lib/ssluse.c
+++ b/libs/curl/lib/ssluse.c
@@ -1190,8 +1190,13 @@ Curl_ossl_connect_step1(struct connectdata *conn,
     req_method = TLSv1_client_method();
     break;
   case CURL_SSLVERSION_SSLv2:
+#ifdef OPENSSL_NO_SSL2
+    failf(data, "OpenSSL was built without SSLv2 support");
+    return CURLE_NOT_BUILT_IN;
+#else
     req_method = SSLv2_client_method();
     break;
+#endif
   case CURL_SSLVERSION_SSLv3:
     req_method = SSLv3_client_method();
     break;
diff --git a/libs/curl/lib/strerror.c b/libs/curl/lib/strerror.c
index 66de7d5570..3c514cb8a1 100644
--- a/libs/curl/lib/strerror.c
+++ b/libs/curl/lib/strerror.c
@@ -69,6 +69,10 @@ curl_easy_strerror(CURLcode error)
   case CURLE_URL_MALFORMAT:
     return "URL using bad/illegal format or missing URL";
 
+  case CURLE_NOT_BUILT_IN:
+    return "A requested feature, protocol or option was not found built-in in"
+	    " this libcurl due to a build-time decision.";
+
   case CURLE_COULDNT_RESOLVE_PROXY:
     return "couldn't resolve proxy name";
 
@@ -278,7 +282,6 @@ curl_easy_strerror(CURLcode error)
     return "caller must register CURLOPT_CONV_ callback options";
 
     /* error codes not used by current libcurl */
-  case CURLE_URL_MALFORMAT_USER:
   case CURLE_FTP_USER_PASSWORD_INCORRECT:
   case CURLE_MALFORMAT_USER:
   case CURLE_BAD_CALLING_ORDER: