diff --git a/x11-wm/cwm/Makefile b/x11-wm/cwm/Makefile
index 1efdfca7b50e..c1f7d4832d68 100644
--- a/x11-wm/cwm/Makefile
+++ b/x11-wm/cwm/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	cwm
-DISTVERSION=	6.7
+DISTVERSION=	7.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://leahneukirchen.org/releases/
 
 MAINTAINER=	me@emilengler.com
 COMMENT=	Minimalistic window manager for X11 based on evilwm
 
 LICENSE=	ISCL
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		pkgconfig xorg
 USE_XORG=	x11 xft xrandr
 MAKE_ARGS=	MANPREFIX="${MANPREFIX}/man"
 PLIST_FILES=	bin/cwm \
 		man/man1/cwm.1.gz \
 		man/man5/cwmrc.5.gz
 
 post-patch:
 	@${REINPLACE_CMD} 's@/usr/X11R6@${LOCALBASE}@' ${WRKSRC}/cwmrc.5
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cwm
 
 .include <bsd.port.mk>
diff --git a/x11-wm/cwm/distinfo b/x11-wm/cwm/distinfo
index 126f992a54d8..73538414005c 100644
--- a/x11-wm/cwm/distinfo
+++ b/x11-wm/cwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590178399
-SHA256 (cwm-6.7.tar.gz) = fdd3d5b4fe9b1b03e1fc270d3dd5a031218589a8e40170e8438d2b9c44a35f08
-SIZE (cwm-6.7.tar.gz) = 53172
+TIMESTAMP = 1657781637
+SHA256 (cwm-7.1.tar.gz) = 4a58c5cb4312d8d0f03ba657d7656c12d8d7c1277aeb1c05272984501597bd90
+SIZE (cwm-7.1.tar.gz) = 53667
diff --git a/x11-wm/cwm/files/patch-Makefile b/x11-wm/cwm/files/patch-Makefile
index 8ad8f3c623df..a1d718e0bc16 100644
--- a/x11-wm/cwm/files/patch-Makefile
+++ b/x11-wm/cwm/files/patch-Makefile
@@ -1,14 +1,14 @@
-Prefer libc version over custom strlcpy, strlcat, reallocarray, strtonum
-
---- Makefile.orig	2020-05-22 19:40:11 UTC
+--- Makefile.orig	2022-04-30 15:11:23 UTC
 +++ Makefile
-@@ -11,8 +11,7 @@ SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
+@@ -11,9 +11,8 @@ SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
  
  OBJS=		calmwm.o screen.o xmalloc.o client.o menu.o \
  		search.o util.o xutil.o conf.o xevents.o group.o \
--		kbfunc.o strlcpy.o strlcat.o y.tab.o \
+-		kbfunc.o strlcpy.o strlcat.o parse.o \
 -		strtonum.o reallocarray.o
-+		kbfunc.o y.tab.o
- 		
+-		
++		kbfunc.o parse.o
++
  PKG_CONFIG?=	pkg-config
  
+ CPPFLAGS+=	`${PKG_CONFIG} --cflags x11 xft xrandr`