diff --git a/net/neon/Makefile b/net/neon/Makefile
index d14569a0c5e..e4e83f116f3 100644
--- a/net/neon/Makefile
+++ b/net/neon/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.46 2019/07/12 20:48:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2021/07/11 13:12:52 robert Exp $
 
 COMMENT=		HTTP and WebDAV client library, with C interface
 
-DISTNAME=		neon-0.30.2
-SHARED_LIBS +=  neon                 29.0     # 30.1
-REVISION=		2
+DISTNAME=		neon-0.31.2
+SHARED_LIBS +=  neon                 31.2     # 31.2
 
 CATEGORIES=		net www devel
 
-HOMEPAGE=		http://www.webdav.org/neon/
+HOMEPAGE=		https://notroj.github.io/neon/
 
 # LGPLv2+
 PERMIT_PACKAGE=	Yes
@@ -38,7 +37,7 @@ CONFIGURE_ARGS+=	--with-ca-bundle=/etc/ssl/cert.pem \
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/neon/macros
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/neon
-.for i in README NEWS BUGS TODO THANKS
+.for i in README.md NEWS BUGS TODO THANKS
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/neon
 .endfor
 	cd ${WRKSRC}/macros && \
diff --git a/net/neon/distinfo b/net/neon/distinfo
index 35977af4afe..6cc22477383 100644
--- a/net/neon/distinfo
+++ b/net/neon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (neon-0.30.2.tar.gz) = 2wvYzewym0j1Om8AGZyS1bpAsPAVsVNxjRsV09ln+8o=
-SIZE (neon-0.30.2.tar.gz) = 932779
+SHA256 (neon-0.31.2.tar.gz) = zx7jrCeiFYFKnICAP87k8O3oRm6+rUAmepvRFeFqhng=
+SIZE (neon-0.31.2.tar.gz) = 867914
diff --git a/net/neon/patches/patch-src_ne_openssl_c b/net/neon/patches/patch-src_ne_openssl_c
deleted file mode 100644
index ffa92b4aff0..00000000000
--- a/net/neon/patches/patch-src_ne_openssl_c
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_ne_openssl_c,v 1.5 2017/06/17 13:23:32 jasper Exp $
-
-Fix linking with libressl
-https://git.alpinelinux.org/cgit/aports/tree/main/neon/fix-libressl.patch
-
-Index: src/ne_openssl.c
---- src/ne_openssl.c.orig
-+++ src/ne_openssl.c
-@@ -66,7 +66,7 @@ typedef unsigned char ne_d2i_uchar;
- typedef const unsigned char ne_d2i_uchar;
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_up_ref(x) x->references++
- #define EVP_PKEY_up_ref(x) x->references++
- #define EVP_PKEY_get0_RSA(evp) (evp->pkey.rsa)
-@@ -1199,7 +1199,7 @@ static void thread_lock_neon(int mode, int n, const ch
- 
- int ne__ssl_init(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     CRYPTO_malloc_init();
-     SSL_load_error_strings();
-     SSL_library_init();
-@@ -1242,7 +1242,7 @@ int ne__ssl_init(void)
-                  "for %" NE_FMT_SIZE_T " locks.\n", num_locks);
-     }
- #endif
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */
- 
-     return 0;
- }
diff --git a/net/neon/pkg/PLIST b/net/neon/pkg/PLIST
index 42afacce5fc..1849dd89fd2 100644
--- a/net/neon/pkg/PLIST
+++ b/net/neon/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2014/10/12 07:13:22 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.14 2021/07/11 13:12:52 robert Exp $
 bin/neon-config
 include/neon/
 include/neon/ne_207.h
@@ -25,7 +25,7 @@ include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
 include/neon/ne_xmlreq.h
-lib/libneon.a
+@static-lib lib/libneon.a
 lib/libneon.la
 @lib lib/libneon.so.${LIBneon_VERSION}
 lib/pkgconfig/neon.pc
@@ -129,7 +129,7 @@ lib/pkgconfig/neon.pc
 share/doc/neon/
 share/doc/neon/BUGS
 share/doc/neon/NEWS
-share/doc/neon/README
+share/doc/neon/README.md
 share/doc/neon/THANKS
 share/doc/neon/TODO
 share/doc/neon/html/
@@ -191,6 +191,7 @@ share/locale/tr/LC_MESSAGES/neon.mo
 share/locale/zh_CN/LC_MESSAGES/neon.mo
 share/neon/
 share/neon/macros/
+share/neon/macros/.gitignore
 share/neon/macros/ChangeLog
 share/neon/macros/ld-version-script.m4
 share/neon/macros/neon-test.m4