diff --git a/dns/void-zones-tools/Makefile b/dns/void-zones-tools/Makefile
index 3e61be67540c..aa43a50a11b3 100644
--- a/dns/void-zones-tools/Makefile
+++ b/dns/void-zones-tools/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	void-zones-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.2
-PORTREVISION=	7
+DISTVERSION=	1.0.2-18
+DISTVERSIONSUFFIX=	-g204634a
 CATEGORIES=	dns
 
 MAINTAINER=	vidar@karlsen.tech
 COMMENT=	Prepare a list of void zones that can be readily fed into Unbound
 WWW=		https://github.com/cyclaero/void-zones-tools
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		compiler:c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	cyclaero
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hosts2zones ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/void-zones
 	${INSTALL_SCRIPT} ${WRKSRC}/void-zones-update.sh ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/dns/void-zones-tools/distinfo b/dns/void-zones-tools/distinfo
index 5760c8265575..66380716b2fc 100644
--- a/dns/void-zones-tools/distinfo
+++ b/dns/void-zones-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503447553
-SHA256 (cyclaero-void-zones-tools-v1.0.2_GH0.tar.gz) = 5d276049372825c359fd281e1eee94a7771c2649f03e23796a55d7c959043510
-SIZE (cyclaero-void-zones-tools-v1.0.2_GH0.tar.gz) = 16201
+TIMESTAMP = 1695518114
+SHA256 (cyclaero-void-zones-tools-v1.0.2-18-g204634a_GH0.tar.gz) = 38d364fc8850c86d4fc31a73c19dfc140e5ca992258cb7a5fad4ce267b433419
+SIZE (cyclaero-void-zones-tools-v1.0.2-18-g204634a_GH0.tar.gz) = 16872
diff --git a/dns/void-zones-tools/files/patch-Makefile b/dns/void-zones-tools/files/patch-Makefile
index 453666088597..eff508c7c245 100644
--- a/dns/void-zones-tools/files/patch-Makefile
+++ b/dns/void-zones-tools/files/patch-Makefile
@@ -1,19 +1,13 @@
---- Makefile.orig	2018-08-26 02:54:47 UTC
+--- Makefile.orig	2023-08-28 22:28:23 UTC
 +++ Makefile
-@@ -25,15 +25,7 @@
- 
- CC     ?= clang
+@@ -26,9 +26,7 @@
+ CC ?= clang
+ DV != $(CC) -dumpversion
  
 -.if $(MACHINE) == "i386" || $(MACHINE) == "amd64" || $(MACHINE) == "x86_64"
--CFLAGS = $(CDEFS) -march=native -mssse3 -ffast-math
+-CFLAGS = $(CDEFS) -march=native -mssse3
 -.elif $(MACHINE) == "arm"
--CFLAGS = $(CDEFS) -fsigned-char
--.else
--CFLAGS = $(CDEFS)
--.endif
--
--CFLAGS += -std=c11 -g0 -Ofast -fstrict-aliasing -Wno-parentheses
-+CFLAGS += -std=c11 -fstrict-aliasing -Wno-parentheses
- PREFIX ?= /usr/local
- 
- HEADERS = binutils.h store.h
++.if $(MACHINE) == "arm"
+ CFLAGS = $(CDEFS) -fsigned-char
+ .else
+ CFLAGS = $(CDEFS)
diff --git a/dns/void-zones-tools/files/patch-void-zones-update.sh b/dns/void-zones-tools/files/patch-void-zones-update.sh
deleted file mode 100644
index 767cde956493..000000000000
--- a/dns/void-zones-tools/files/patch-void-zones-update.sh
+++ /dev/null
@@ -1,54 +0,0 @@
---- void-zones-update.sh.orig	2017-08-22 12:36:14 UTC
-+++ void-zones-update.sh
-@@ -47,6 +47,8 @@ fi
- ZONES_DIR="/usr/local/etc/void-zones"
- if [ ! -d "$ZONES_DIR" ]; then
-    mkdir -p "$ZONES_DIR"
-+fi
-+if [ ! -f "$ZONES_DIR/my_void_hosts.txt" ]; then
-    echo "# white list"          > "$ZONES_DIR/my_void_hosts.txt"
-    echo "1.1.1.1 my.white.dom" >> "$ZONES_DIR/my_void_hosts.txt"
-    echo ""                     >> "$ZONES_DIR/my_void_hosts.txt"
-@@ -63,9 +65,8 @@ $FETCH -o "$ZONES_DIR/mdl_void_hosts.txt
- $FETCH -o "$ZONES_DIR/away_void_hosts.txt"     "https://adaway.org/hosts.txt"
- $FETCH -o "$ZONES_DIR/jdom_void_list.txt"      "http://mirror1.malwaredomains.com/files/justdomains"
- $FETCH -o "$ZONES_DIR/ucky_void_host.txt"     "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
--$FETCH -o "$ZONES_DIR/w10telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win10/spy.txt"
--$FETCH -o "$ZONES_DIR/w81telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win81/spy.txt"
--$FETCH -o "$ZONES_DIR/w7telm_void_hosts.txt"  "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win7/spy.txt"
-+$FETCH -o "$ZONES_DIR/wintelm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
-+
- 
- if [ ! -f "$ZONES_DIR/pgl_void_hosts.txt" ] ; then
-    echo "# No hosts from pgl." > "$ZONES_DIR/pgl_void_hosts.txt"
-@@ -95,17 +96,10 @@ if [ ! -f "$ZONES_DIR/ucky_void_host.txt
-    echo "# No hosts from FadeMind/unchecky." > "$ZONES_DIR/ucky_void_host.txt"
- fi
- 
--if [ ! -f "$ZONES_DIR/w10telm_void_hosts.txt" ] ; then
--   echo "# No hosts from WindowsSpyBlocker/win10/spy." > "$ZONES_DIR/w10telm_void_hosts.txt"
--fi
--
--if [ ! -f "$ZONES_DIR/w81telm_void_hosts.txt" ] ; then
--   echo "# No hosts from WindowsSpyBlocker/win81/spy." > "$ZONES_DIR/w81telm_void_hosts.txt"
-+if [ ! -f "$ZONES_DIR/wintelm_void_hosts.txt" ] ; then
-+   echo "# No hosts from WindowsSpyBlocker/hosts/spy." > "$ZONES_DIR/wintelm_void_hosts.txt"
- fi
- 
--if [ ! -f "$ZONES_DIR/w7telm_void_hosts.txt" ] ; then
--   echo "# No hosts from WindowsSpyBlocker/win7/spy." > "$ZONES_DIR/w7telm_void_hosts.txt"
--fi
- 
- /usr/local/bin/hosts2zones /tmp/local-void.zones \
-                            "$ZONES_DIR/my_void_hosts.txt" \
-@@ -116,9 +110,7 @@ fi
-                            "$ZONES_DIR/away_void_hosts.txt" \
-                            "$ZONES_DIR/jdom_void_list.txt" \
-                            "$ZONES_DIR/ucky_void_host.txt" \
--                           "$ZONES_DIR/w10telm_void_hosts.txt" \
--                           "$ZONES_DIR/w81telm_void_hosts.txt" \
--                           "$ZONES_DIR/w7telm_void_hosts.txt" \
-+                           "$ZONES_DIR/wintelm_void_hosts.txt" \
-                            "$ZONES_DIR/x_void_list.txt" \
-                            "$ZONES_DIR/y_void_list.txt" \
-                            "$ZONES_DIR/z_void_list.txt" \