diff --git a/devel/z88dk/Makefile b/devel/z88dk/Makefile
index d3c7721603bd..5e5973549ad6 100644
--- a/devel/z88dk/Makefile
+++ b/devel/z88dk/Makefile
@@ -56,8 +56,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS =/s,$$, -I../../../include,' \
 		${WRKSRC}/test/suites/make.config
 # Fix the build against Clang 15
-	@${REINPLACE_CMD} -e '/patchdata/s,NULL,0,' \
-		${WRKSRC}/src/appmake/zxn.c
 	@${REINPLACE_CMD} -e '/, ifs/s,move,std::&,' \
 		${WRKSRC}/src/z80asm/src/cpp/preproc.cpp
 
diff --git a/devel/z88dk/files/patch-src_appmake_zxn.c b/devel/z88dk/files/patch-src_appmake_zxn.c
new file mode 100644
index 000000000000..79eb540aa803
--- /dev/null
+++ b/devel/z88dk/files/patch-src_appmake_zxn.c
@@ -0,0 +1,10 @@
+--- src/appmake/zxn.c.orig	2020-08-15 03:00:06 UTC
++++ src/appmake/zxn.c
+@@ -31,6 +31,7 @@ static struct zx_tape zxt = {
+     NULL,       // merge
+     -1,         // patchpos
+     -1,         // clear_address
++    -1,         // usr_address
+     NULL,       // patchdata
+     NULL,       // screen
+     0,          // audio