diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile
index c0b38a484120..76f152e51349 100644
--- a/net/wireguard-tools/Makefile
+++ b/net/wireguard-tools/Makefile
@@ -1,60 +1,59 @@
 
 PORTNAME=	wireguard-tools
-PORTVERSION=	1.0.20210315
-PORTREVISION=	4
+PORTVERSION=	1.0.20210424
 CATEGORIES=	net net-vpn
 MASTER_SITES=	https://git.zx2c4.com/wireguard-tools/snapshot/
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Fast, modern and secure VPN Tunnel
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 FLAVORS=	default lite
 lite_PKGNAMESUFFIX=	-lite
 
 USES=		gmake tar:xz
 
 WRKSRC_SUBDIR=	src
 
 MAKE_ARGS+=	DEBUG=no WITH_BASHCOMPLETION=yes WITH_SYSTEMDUNITS=no
 MAKE_ENV+=	MANDIR="${MANPREFIX}/man" \
 		SYSCONFDIR="${PREFIX}/etc"
 
 OPTIONS_DEFINE=	WGQUICK
 OPTIONS_DEFAULT=WGQUICK
 OPTIONS_SUB=	yes
 
 WGQUICK_DESC=		wg-quick(8) userland utility
 WGQUICK_RUN_DEPENDS=	bash:shells/bash
 WGQUICK_MAKE_ARGS=	WITH_WGQUICK=yes
 WGQUICK_MAKE_ARGS_OFF=	WITH_WGQUICK=no
 
 .if ${FLAVOR:U} == lite
 USE_RC_SUBR=	wireguard_lite
 OPTIONS_EXCLUDE=WGQUICK
 COMMENT+=	(lite flavor)
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWGQUICK}
 USE_RC_SUBR=	wireguard_wgquick
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/completion/wg-quick.bash-completion \
 		${WRKSRC}/wg-quick/freebsd.bash
 
 install-rc-script:
 	@${ECHO_MSG} "===> Staging rc.d startup script(s)"
 	@for i in ${USE_RC_SUBR}; do \
 		_prefix=${PREFIX}; \
 		[ "${PREFIX}" = "/usr" ] && _prefix="" ; \
 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/wireguard; \
 		${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/wireguard" >> ${TMPPLIST}; \
 	done
 
 .include <bsd.port.mk>
diff --git a/net/wireguard-tools/distinfo b/net/wireguard-tools/distinfo
index 4c86269fb72f..e06efeab4d7b 100644
--- a/net/wireguard-tools/distinfo
+++ b/net/wireguard-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615824165
-SHA256 (wireguard-tools-1.0.20210315.tar.xz) = af001d5492be6bf58ef0bebe04b446b6f50eb53e1226fab679cc34af40733a22
-SIZE (wireguard-tools-1.0.20210315.tar.xz) = 96988
+TIMESTAMP = 1619350661
+SHA256 (wireguard-tools-1.0.20210424.tar.xz) = b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad
+SIZE (wireguard-tools-1.0.20210424.tar.xz) = 96816
diff --git a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1
deleted file mode 100644
index b73bd664e441..000000000000
--- a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1
+++ /dev/null
@@ -1,17 +0,0 @@
-From a43f0b634e714cd5cddff373b00c964a57e7b7fc Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Sun, 21 Mar 2021 10:15:32 -0600
-Subject: wg-quick: freebsd: check for socket using -S, not -f
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---- wg-quick/freebsd.bash.orig	2021-03-15 14:04:02 UTC
-+++ wg-quick/freebsd.bash
-@@ -168,7 +168,7 @@ if_exists() {
- 
- del_if() {
- 	[[ $HAVE_SET_DNS -eq 0 ]] || unset_dns
--	if [[ -f /var/run/wireguard/$INTERFACE.sock ]]; then
-+	if [[ -S /var/run/wireguard/$INTERFACE.sock ]]; then
- 		cmd rm -f "/var/run/wireguard/$INTERFACE.sock"
- 	else
- 		cmd ifconfig "$INTERFACE" destroy
diff --git a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2
deleted file mode 100644
index 96cb6def8649..000000000000
--- a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2
+++ /dev/null
@@ -1,17 +0,0 @@
-From 163cef8b9013898bbe0d0b8d4afd25264e999858 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Tue, 23 Mar 2021 12:28:22 -0600
-Subject: wg-quick: freebsd: do not assume point-to-point interface flag
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---- wg-quick/freebsd.bash.orig	2021-03-23 19:38:00 UTC
-+++ wg-quick/freebsd.bash
-@@ -190,7 +190,7 @@ add_addr() {
- 	if [[ $1 == *:* ]]; then
- 		cmd ifconfig "$INTERFACE" inet6 "$1" alias
- 	else
--		cmd ifconfig "$INTERFACE" inet "$1" "${1%%/*}" alias
-+		cmd ifconfig "$INTERFACE" inet "$1" alias
- 	fi
- }
-