diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
index 9a13a2a215a0..4a1689ed0944 100644
--- a/net-im/ricochet/Makefile
+++ b/net-im/ricochet/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ricochet
 PORTVERSION=	1.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
@@ -33,10 +33,6 @@ PLIST_FILES=	bin/ricochet \
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT:Mlibressl*}
-IGNORE= Detected LibreSSL (missing RSA_get0_factors)
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E 's| -fsanitize=[a-z-]+| |g' \
 		${WRKSRC}/hardened.pri
diff --git a/net-im/ricochet/files/patch-src_main.cpp b/net-im/ricochet/files/patch-src_main.cpp
new file mode 100644
index 000000000000..3a0fb1cddc3e
--- /dev/null
+++ b/net-im/ricochet/files/patch-src_main.cpp
@@ -0,0 +1,11 @@
+--- src/main.cpp.orig	2016-11-04 22:05:33 UTC
++++ src/main.cpp
+@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
+     initTranslation();
+ 
+     /* Initialize OpenSSL's allocator */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_malloc_init();
+ #else
+     OPENSSL_malloc_init();
diff --git a/net-im/ricochet/files/patch-src_utils_CryptoKey.cpp b/net-im/ricochet/files/patch-src_utils_CryptoKey.cpp
new file mode 100644
index 000000000000..f4761237afe5
--- /dev/null
+++ b/net-im/ricochet/files/patch-src_utils_CryptoKey.cpp
@@ -0,0 +1,11 @@
+--- src/utils/CryptoKey.cpp.orig	2016-11-04 22:05:33 UTC
++++ src/utils/CryptoKey.cpp
+@@ -39,7 +39,7 @@
+ #include <openssl/bio.h>
+ #include <openssl/pem.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
+ {
+   *p = r->p;