diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index 9c113be1c278..53396fd8b69b 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	libssh2
 PORTVERSION=	1.10.0
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.libssh2.org/download/ \
 		LOCAL/sbz
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol
 WWW=		https://www.libssh2.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c11 cpe libtool pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	GCRYPT TRACE ZLIB
 OPTIONS_DEFAULT=	ZLIB
 
 TRACE_DESC=	Enable debug packet traces
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_USES_OFF=	ssl
 GCRYPT_CONFIGURE_ON=	--with-crypto=libgcrypt
 GCRYPT_CONFIGURE_OFF=	--with-crypto=openssl
 GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
 GCRYPT_LIBS=		-L${LOCALBASE}/lib
 TRACE_CONFIGURE_ENABLE=	debug
 ZLIB_CONFIGURE_WITH=	libz
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \
 		${WRKSRC}/libssh2.pc.in
 .if ! ${PORT_OPTIONS:MGCRYPT}
 .  if ${SSL_DEFAULT} == base
 	@${REINPLACE_CMD} -e 's/LIBSREQUIRED="$$LIBSREQUIRED$${LIBSREQUIRED:+ }libssl libcrypto"/LIBS="$$LIBS -lssl -lcrypto"/' \
 		${WRKSRC}/configure
 .  endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/libssh2/files/patch-src_openssl.c b/security/libssh2/files/patch-src_openssl.c
deleted file mode 100644
index 3e167ab08da8..000000000000
--- a/security/libssh2/files/patch-src_openssl.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/openssl.c.orig	2022-10-17 08:20:24 UTC
-+++ src/openssl.c
-@@ -653,8 +653,7 @@ _libssh2_EVP_aes_256_ctr(void)
- 
- void _libssh2_openssl_crypto_init(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
--    !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- #ifndef OPENSSL_NO_ENGINE
-     ENGINE_load_builtin_engines();
-     ENGINE_register_all_complete();
diff --git a/security/libssh2/files/patch-src_openssl.h b/security/libssh2/files/patch-src_openssl.h
index 0bbca531c2c7..efde2680c54d 100644
--- a/security/libssh2/files/patch-src_openssl.h
+++ b/security/libssh2/files/patch-src_openssl.h
@@ -1,12 +1,17 @@
---- src/openssl.h.orig	2022-10-17 08:18:24 UTC
+Backported from upstream commit
+<https://github.com/libssh2/libssh2/commit/b952674f>
+
+--- src/openssl.h.orig	2021-05-14 21:36:06 UTC
 +++ src/openssl.h
-@@ -57,8 +57,7 @@
+@@ -57,8 +57,9 @@
  #include <openssl/pem.h>
  #include <openssl/rand.h>
  
 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
 -    !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
++    !defined(LIBRESSL_VERSION_NUMBER)) || \
++    LIBRESSL_VERSION_NUMBER >= 0x3050000fL
  # define HAVE_OPAQUE_STRUCTS 1
  #endif