diff --git a/net/serf/Makefile b/net/serf/Makefile
index 4d332d68708..281c75204e9 100644
--- a/net/serf/Makefile
+++ b/net/serf/Makefile
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2021/02/03 22:22:42 sthen Exp $
 
 COMMENT =		high performance HTTP client library
-DISTNAME =		serf-1.3.8
+DISTNAME =		serf-1.3.9
 SHARED_LIBS = 		serf-1                    1.0 # 1.3.0
 CATEGORIES =		net
-HOMEPAGE =		https://code.google.com/p/serf/
+HOMEPAGE =		https://serf.apache.org/
 MAINTAINER =		Stefan Sperling <stsp@openbsd.org>
-REVISION =		0
 
 # APLv2
 PERMIT_PACKAGE =	Yes
 
 WANTLIB = 		apr-1 aprutil-1 crypto db expat iconv pthread ssl z
-MASTER_SITES =		https://serf.googlecode.com/svn/src_releases/
+MASTER_SITES =		https://www.apache.org/dist/serf/
 EXTRACT_SUFX =		.tar.bz2
 
 MODULES = 		devel/scons
diff --git a/net/serf/distinfo b/net/serf/distinfo
index 3bde736874e..81de8b41324 100644
--- a/net/serf/distinfo
+++ b/net/serf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (serf-1.3.8.tar.bz2) = 4FAL4GXbvOSQRJg3uyq2JORtZPwLCQR02ayqh8grJZA=
-SIZE (serf-1.3.8.tar.bz2) = 143337
+SHA256 (serf-1.3.9.tar.bz2) = VJwtIcV3qKnARQ+stcyoCfJlkfBI5GZVIkCUe996h8w=
+SIZE (serf-1.3.9.tar.bz2) = 145132
diff --git a/net/serf/patches/patch-buckets_ssl_buckets_c b/net/serf/patches/patch-buckets_ssl_buckets_c
new file mode 100644
index 00000000000..b3c33350a17
--- /dev/null
+++ b/net/serf/patches/patch-buckets_ssl_buckets_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-buckets_ssl_buckets_c,v 1.3 2021/02/03 22:22:42 sthen Exp $
+
+Index: buckets/ssl_buckets.c
+--- buckets/ssl_buckets.c.orig
++++ buckets/ssl_buckets.c
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+         }
+ #endif
+ 
+-#ifdef USE_OPENSSL_1_1_API
++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
+         OPENSSL_malloc_init();
+ #else
+         CRYPTO_malloc_init();
diff --git a/net/serf/patches/patch-test_server_test_sslserver_c b/net/serf/patches/patch-test_server_test_sslserver_c
new file mode 100644
index 00000000000..2dfbf8e55b6
--- /dev/null
+++ b/net/serf/patches/patch-test_server_test_sslserver_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-test_server_test_sslserver_c,v 1.1 2021/02/03 22:22:42 sthen Exp $
+
+Index: test/server/test_sslserver.c
+--- test/server/test_sslserver.c.orig
++++ test/server/test_sslserver.c
+@@ -228,7 +228,7 @@ init_ssl_context(serv_ctx_t *serv_ctx,
+     /* Init OpenSSL globally */
+     if (!init_done)
+     {
+-#ifdef USE_OPENSSL_1_1_API
++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
+         OPENSSL_malloc_init();
+ #else
+         CRYPTO_malloc_init();
diff --git a/net/serf/pkg/PLIST b/net/serf/pkg/PLIST
index de8c583e638..79ccf2d7348 100644
--- a/net/serf/pkg/PLIST
+++ b/net/serf/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/05/22 11:31:17 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/02/03 22:22:42 sthen Exp $
 include/serf-1/
 include/serf-1/serf.h
 include/serf-1/serf_bucket_types.h
 include/serf-1/serf_bucket_util.h
-lib/libserf-1.a
+@static-lib lib/libserf-1.a
 @lib lib/libserf-1.so.${LIBserf-1_VERSION}
 lib/pkgconfig/serf-1.pc