diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 72f7512fa58d..c87f71570cd3 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -1,55 +1,53 @@
 PORTNAME=	curl
 PORTVERSION=	2.1.0
 CATEGORIES=	ftp
 MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	rexx-
 DISTNAME=	RexxCURL-${PORTVERSION}
 
 MAINTAINER=	bob@eager.cx
 COMMENT=	External function package providing an interface to the cURL package
 WWW=		http://rexxcurl.sourceforge.net/
 
-BROKEN=		does not build with curl 7.85.0: use of undeclared identifier 'CURLOPT_FTP_RESPONSE_TIMEOUT'
-
 LICENSE=	CPLV1
 LICENSE_NAME=	CPL V1.0 license
 LICENSE_FILE=	${WRKSRC}/CPLv1.0.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	rexx:lang/rexx-regina
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libregina.so:lang/rexx-regina
 RUN_DEPENDS=	rexx:lang/rexx-regina
 
 USES=		gmake
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rexx=regina LDFLAGS=-L/usr/lib
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DATADIR=	${PREFIX}/share/rexx${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/rexx${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/rexx${PORTNAME}
 
 DOCFILES=	getright.rexx getmail-pop3.rexx httppost.rexx scp.rexx \
 		sendmail-smtp.rexx testcurl.rexx upload.rexx README.txt
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rexxcurl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/librexxcurl.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/librexxcurl.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/doc/images/rxcurl64.png ${STAGEDIR}${DOCSDIR}/images
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/demo/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c
index 6e64288906fe..c709be7477b9 100644
--- a/ftp/rexx-curl/files/patch-rexxcurl.c
+++ b/ftp/rexx-curl/files/patch-rexxcurl.c
@@ -1,38 +1,52 @@
 --- rexxcurl.c.orig	2019-02-10 22:51:41 UTC
 +++ rexxcurl.c
 @@ -52,6 +52,8 @@
   * internal error                   set                 N/A
   * cURL runtime errors              -1                  set
   */
 +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
 +
  #ifdef HAVE_CONFIG_H
  # include "config.h"
  #else
-@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy
+@@ -480,8 +482,13 @@ static curl_options RexxCurlOptions[] =
+    { "FTPLISTONLY"     ,CURLOPT_FTPLISTONLY     ,RXCURLOPT_BOOL        , NULL },
+ #endif
+    { "FTPPORT"         ,CURLOPT_FTPPORT         ,RXCURLOPT_STRING      , NULL },
++#if LIBCURL_VERSION_NUM >= 0x075500
++   { "FTPRESPONSETIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
++#endif
+ #if LIBCURL_VERSION_NUM >= 0x070a08
++# if LIBCURL_VERSION_NUM < 0x075500
+    { "FTPRESPONSETIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
++# endif
+ #endif
+ #if LIBCURL_VERSION_NUM >= 0x070e00
+    { "FTPSKIPPASVIP"   ,CURLOPT_FTP_SKIP_PASV_IP,RXCURLOPT_BOOL        , NULL },
+@@ -1879,9 +1886,9 @@ int rexxcurl_sshkey_callback( CURL *easy,     /* easy 
        if ( argv == NULL )
           return -1;
  
 -      rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", knownkey->len );
 +      rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", (unsigned long) knownkey->len );
        rx_knownkeytype_len = sprintf( rx_knownkeytype, "%u", knownkey->keytype );
 -      rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", foundkey->len );
 +      rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", (unsigned long) foundkey->len );
        rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
        rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
  
-@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i
+@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type, 
     int c;
     char *prefix = "*<><><>";
     if ( type == CURLINFO_TEXT )
 -      fprintf( fp, "text: %c %.*s", prefix[type],size, data );
 +      fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data );
     if ( type == CURLINFO_HEADER_IN )
 -      fprintf( fp, "header_in: %c %.*s", prefix[type],size, data );
 +      fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data );
     if ( type == CURLINFO_HEADER_OUT )
 -      fprintf( fp, "header_out:%c %.*s", prefix[type],size, data );
 +      fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data );
     if ( type == CURLINFO_SSL_DATA_IN )
     {
        fprintf( fp, "ssl_data_in: " );