diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 6a4ef5a42333..c271e30d3bbd 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	lrzsz
 PORTVERSION=	0.12.20
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms
 MASTER_SITES=	http://ohse.de/uwe/releases/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Receive/Send files via X/Y/ZMODEM protocol (unrestrictive)
 WWW=		https://ohse.de/uwe/software/lrzsz.html
 
 LICENSE=	GPLv2
 
 USES=		cpe
 
 CPE_VENDOR=	lrzsz_project
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 ALL_TARGET=	all # vcheck
 
 CONFLICTS_INSTALL=	lrzip # bin/lrz
 
 OPTIONS_DEFINE=	NLS
 
 NLS_USES=		gettext
 NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/lrzsz.mo
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	${REINPLACE_CMD} '/checking for syslog/,+140d' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/comms/lrzsz/files/patch-zm.c b/comms/lrzsz/files/patch-zm.c
new file mode 100644
index 000000000000..fdf38e31aad2
--- /dev/null
+++ b/comms/lrzsz/files/patch-zm.c
@@ -0,0 +1,19 @@
+--- src/zm.c.orig	1998-12-29 16:48:38 UTC
++++ src/zm.c
+@@ -431,10 +431,12 @@ zsdata(const char *buf, size_t length, int frameend)
+ 	VPRINTF(3,("zsdata: %lu %s", (unsigned long) length, 
+ 		Zendnames[(frameend-ZCRCE)&3]));
+ 	crc = 0;
+-	do {
+-		zsendline(*buf); crc = updcrc((0377 & *buf), crc);
+-		buf++;
+-	} while (--length>0);
++
++	for( ; length; length--) {
++	  zsendline(*buf); crc = updcrc((0377 & *buf), crc);
++	  buf++;
++	}
++
+ 	xsendline(ZDLE); xsendline(frameend);
+ 	crc = updcrc(frameend, crc);
+