diff --git a/dns/nextdns/Makefile b/dns/nextdns/Makefile
index f45b154b839b..9c2fa9ab8a17 100644
--- a/dns/nextdns/Makefile
+++ b/dns/nextdns/Makefile
@@ -1,37 +1,36 @@
 PORTNAME=	nextdns
-PORTVERSION=	1.37.11
+PORTVERSION=	1.39.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	14
 CATEGORIES=	dns security
 
 MAINTAINER=	rs@nextdns.io
 COMMENT=	NextDNS DNS53 to DNS over HTTPS proxy
 WWW=		https://github.com/nextdns/nextdns
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>=3.35:security/ca_root_nss
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_TUPLE=	\
 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
 		denisbrodbeck:machineid:v1.0.1:denisbrodbeck_machineid/vendor/github.com/denisbrodbeck/machineid \
 		golang:net:v0.8.0:golang_net/vendor/golang.org/x/net \
 		golang:sys:v0.6.0:golang_sys/vendor/golang.org/x/sys \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		vishvananda:netlink:v1.1.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
 		vishvananda:netns:2eb08e3e575f:vishvananda_netns/vendor/github.com/vishvananda/netns
 
 GO_TARGET=	.:${PREFIX}/sbin/${PORTNAME}
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	sbin/${PORTNAME} \
 		"@sample etc/${PORTNAME}.conf.sample"
 
 post-install:
 	@${STAGEDIR}${PREFIX}/sbin/${PORTNAME} config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
diff --git a/dns/nextdns/distinfo b/dns/nextdns/distinfo
index a7ac7e38e93b..85db292ef9dd 100644
--- a/dns/nextdns/distinfo
+++ b/dns/nextdns/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1679528608
-SHA256 (nextdns-nextdns-v1.37.11_GH0.tar.gz) = f70cb424b0ae47456c8579d3910b486f75afde34572f28f8cf6eb1222e59b88b
-SIZE (nextdns-nextdns-v1.37.11_GH0.tar.gz) = 198085
+TIMESTAMP = 1683921582
+SHA256 (nextdns-nextdns-v1.39.4_GH0.tar.gz) = e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac
+SIZE (nextdns-nextdns-v1.39.4_GH0.tar.gz) = 198958
 SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
 SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
 SHA256 (denisbrodbeck-machineid-v1.0.1_GH0.tar.gz) = 0a01d2b131419cb2b9f7d910a2c90b824449bd91005b47efb235dc707665337a
 SIZE (denisbrodbeck-machineid-v1.0.1_GH0.tar.gz) = 27807
 SHA256 (golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
 SIZE (golang-net-v0.8.0_GH0.tar.gz) = 1244302
 SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
 SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
 SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
 SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428
 SHA256 (vishvananda-netlink-v1.1.0_GH0.tar.gz) = c72754916ac1551cea4e1f801d5b2c26c1476f11bd3130382a4a890822eb5929
 SIZE (vishvananda-netlink-v1.1.0_GH0.tar.gz) = 147026
 SHA256 (vishvananda-netns-2eb08e3e575f_GH0.tar.gz) = 049a592025d3b7011acb83f2c6074a75143d3d95f842526d10f0589155283f0c
 SIZE (vishvananda-netns-2eb08e3e575f_GH0.tar.gz) = 8579
diff --git a/dns/nextdns/pkg-deinstall b/dns/nextdns/pkg-deinstall
deleted file mode 100644
index 0f9496f07f2f..000000000000
--- a/dns/nextdns/pkg-deinstall
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ x"$2" != x"DEINSTALL" ]; then
-    exit 0
-fi
-
-${PKG_PREFIX}/nextdns uninstall >/dev/null 2>/dev/null
-
-exit 0
diff --git a/dns/nextdns/pkg-pre-deinstall b/dns/nextdns/pkg-pre-deinstall
new file mode 100644
index 000000000000..232d61c89be5
--- /dev/null
+++ b/dns/nextdns/pkg-pre-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+${PKG_PREFIX}/sbin/nextdns uninstall >/dev/null 2>/dev/null
+
+exit 0