diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libssh2
 PORTVERSION=	1.10.0
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.libssh2.org/download/ \
diff --git a/security/libssh2/files/patch-src_openssl.h b/security/libssh2/files/patch-src_openssl.h
--- 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
  
diff --git a/security/libssh2/files/patch-src_openssl.c b/security/libssh2/files/patch-src_openssl.c
deleted file mode 100644
--- 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();