diff --git a/srcpkgs/socat/patches/patch-sslcls_c b/srcpkgs/socat/patches/patch-sslcls_c
index 1cc907bf7a0..fa20a08b1ca 100644
--- a/srcpkgs/socat/patches/patch-sslcls_c
+++ b/srcpkgs/socat/patches/patch-sslcls_c
@@ -1,7 +1,33 @@
-$OpenBSD: patch-sslcls_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
---- sslcls.c.orig	Sat Feb  8 20:23:33 2014
-+++ sslcls.c	Sat Jul 12 16:01:25 2014
-@@ -275,14 +275,6 @@ void sycSSL_free(SSL *ssl) {
+$OpenBSD: patch-sslcls_c,v 1.4 2015/07/20 01:12:09 jca Exp $
+--- sslcls.c.orig	Sat Jan 24 03:15:22 2015
++++ sslcls.c	Sat Jul 18 20:01:59 2015
+@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
+ }
+ #endif
+ 
++#ifdef HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_client_method(void) {
+    const SSL_METHOD *result;
+    Debug("SSLv3_client_method()");
+@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
+    Debug1("SSLv3_client_method() -> %p", result);
+    return result;
+ }
++#endif
+ 
++#ifdef HAVE_SSLv3_server_method
+ const SSL_METHOD *sycSSLv3_server_method(void) {
+    const SSL_METHOD *result;
+    Debug("SSLv3_server_method()");
+@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
+    Debug1("SSLv3_server_method() -> %p", result);
+    return result;
+ }
++#endif
+ 
+ const SSL_METHOD *sycSSLv23_client_method(void) {
+    const SSL_METHOD *result;
+@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) {
     return;
  }
  
@@ -16,7 +42,7 @@ $OpenBSD: patch-sslcls_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
  DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
     DH *result;
     Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
-@@ -319,7 +311,7 @@ int sycFIPS_mode_set(int onoff) {
+@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) {
  }
  #endif /* WITH_FIPS */
  
diff --git a/srcpkgs/socat/patches/patch-xio-openssl_c b/srcpkgs/socat/patches/patch-xio-openssl_c
index e348f63bbb4..56f0d3e0503 100644
--- a/srcpkgs/socat/patches/patch-xio-openssl_c
+++ b/srcpkgs/socat/patches/patch-xio-openssl_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
---- xio-openssl.c.orig	Sun Mar  2 20:26:45 2014
-+++ xio-openssl.c	Sat Jul 12 16:00:50 2014
-@@ -102,7 +102,6 @@ const struct optdesc opt_openssl_key         = { "open
+$OpenBSD: patch-xio-openssl_c,v 1.3.4.1 2016/02/02 10:41:06 sthen Exp $
+--- xio-openssl.c.orig	Fri Jan 29 10:28:38 2016
++++ xio-openssl.c	Mon Feb  1 16:30:57 2016
+@@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key         = { "open
  const struct optdesc opt_openssl_dhparam     = { "openssl-dhparam",     "dh",    OPT_OPENSSL_DHPARAM,     GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
  const struct optdesc opt_openssl_cafile      = { "openssl-cafile",     "cafile", OPT_OPENSSL_CAFILE,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
  const struct optdesc opt_openssl_capath      = { "openssl-capath",     "capath", OPT_OPENSSL_CAPATH,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
@@ -9,7 +9,7 @@ $OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
  const struct optdesc opt_openssl_pseudo      = { "openssl-pseudo",     "pseudo", OPT_OPENSSL_PSEUDO,      GROUP_OPENSSL, PH_SPEC, TYPE_BOOL,     OFUNC_SPEC };
  #if OPENSSL_VERSION_NUMBER >= 0x00908000L
  const struct optdesc opt_openssl_compress    = { "openssl-compress",   "compress", OPT_OPENSSL_COMPRESS,  GROUP_OPENSSL, PH_SPEC, TYPE_STRING,   OFUNC_SPEC };
-@@ -140,7 +139,7 @@ int xio_reset_fips_mode(void) {
+@@ -147,7 +146,7 @@ int xio_reset_fips_mode(void) {
  static void openssl_conn_loginfo(SSL *ssl) {
     Notice1("SSL connection using %s", SSL_get_cipher(ssl));
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
     {
        const COMP_METHOD *comp, *expansion;
  
-@@ -697,7 +696,6 @@ int
+@@ -722,7 +721,6 @@ int
     char *opt_dhparam = NULL;	/* file name of DH params */
     char *opt_cafile = NULL;	/* certificate authority file */
     char *opt_capath = NULL;	/* certificate authority directory */
@@ -26,7 +26,7 @@ $OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
  #if OPENSSL_VERSION_NUMBER >= 0x00908000L
     char *opt_compress = NULL;	/* compression method */
  #endif
-@@ -716,7 +714,6 @@ int
+@@ -741,7 +739,6 @@ int
     retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
     retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
     retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
@@ -34,7 +34,7 @@ $OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
     retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
  #if OPENSSL_VERSION_NUMBER >= 0x00908000L
     retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
-@@ -796,10 +793,6 @@ int
+@@ -877,10 +874,6 @@ int
        }
     }
  
@@ -45,12 +45,12 @@ $OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
     if (opt_pseudo) {
        long int randdata;
        /* initialize libc random from actual microseconds */
-@@ -979,7 +972,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char
-      if (e == ((ERR_LIB_RAND<<24)|
-		(RAND_F_SSLEAY_RAND_BYTES<<12)|
-		(RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
--      Error("too few entropy; use options \"egd\" or \"pseudo\"");
-+      Error("too few entropy; use options \"pseudo\"");
-	 stat = STAT_NORETRY;
-      } else {
-	 Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));
+@@ -1105,7 +1098,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char
+       if (e == ((ERR_LIB_RAND<<24)|
+ 		(RAND_F_SSLEAY_RAND_BYTES<<12)|
+ 		(RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
+-	 Error("too few entropy; use options \"egd\" or \"pseudo\"");
++	 Error("too few entropy; use option \"pseudo\"");
+ 	 stat = STAT_NORETRY;
+       } else {
+ 	 Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));