diff --git a/x11/wmutils-core/Makefile b/x11/wmutils-core/Makefile
index c26fc7f3447a..a2ed036b8f57 100644
--- a/x11/wmutils-core/Makefile
+++ b/x11/wmutils-core/Makefile
@@ -1,29 +1,32 @@
 PORTNAME=	wmutils-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Set of window manipulation tools
 WWW=		https://github.com/wmutils/core
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
 		libxcb-cursor.so:x11/xcb-util-cursor
 
 USES=		localbase:ldflags xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wmutils
 GH_PROJECT=	core
 
+MAKE_ARGS= 	PREFIX="${PREFIX}" CC="${CC}" MANPREFIX="${PREFIX}/share/man"
+
 USE_XORG=	xcb
 
 CONFLICTS=	wtf  # games/wtf
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/x11/wmutils-core/files/patch-config.mk b/x11/wmutils-core/files/patch-config.mk
index fd109106f939..d656368ed536 100644
--- a/x11/wmutils-core/files/patch-config.mk
+++ b/x11/wmutils-core/files/patch-config.mk
@@ -1,15 +1,11 @@
---- config.mk.orig	2019-10-16 17:08:21 UTC
+--- config.mk.orig	2022-07-01 20:47:48 UTC
 +++ config.mk
-@@ -1,9 +1,9 @@
--PREFIX = /usr
-+PREFIX ?= /usr/local
- MANPREFIX = $(PREFIX)/man
- 
+@@ -4,6 +4,6 @@ LD      = $(CC)
  CC      = cc
  LD      = $(CC)
  
 -CFLAGS  = -std=c99 -pedantic -Wall -Os -I/usr/X11R6/include
 -LDFLAGS = -lxcb -lxcb-util -lxcb-cursor -L/usr/X11R6/lib
 +CFLAGS  := -std=c99 -pedantic -Wall -Os $(CFLAGS)
 +LDFLAGS := -lxcb -lxcb-util -lxcb-cursor $(LDFLAGS)
  
diff --git a/x11/wmutils-core/pkg-plist b/x11/wmutils-core/pkg-plist
index e429175f5657..54eeec5c0384 100644
--- a/x11/wmutils-core/pkg-plist
+++ b/x11/wmutils-core/pkg-plist
@@ -1,32 +1,32 @@
 bin/atomx
 bin/chwb
 bin/chwso
 bin/ignw
 bin/killw
 bin/lsw
 bin/mapw
 bin/pdw
 bin/pfw
 bin/slw
 bin/wattr
 bin/wmp
 bin/wmv
 bin/wrs
 bin/wtf
 bin/wtp
-man/man1/atomx.1.gz
-man/man1/chwb.1.gz
-man/man1/chwso.1.gz
-man/man1/ignw.1.gz
-man/man1/killw.1.gz
-man/man1/lsw.1.gz
-man/man1/mapw.1.gz
-man/man1/pfw.1.gz
-man/man1/slw.1.gz
-man/man1/wattr.1.gz
-man/man1/wmp.1.gz
-man/man1/wmutils.1.gz
-man/man1/wmv.1.gz
-man/man1/wrs.1.gz
-man/man1/wtf.1.gz
-man/man1/wtp.1.gz
+share/man/man1/atomx.1.gz
+share/man/man1/chwb.1.gz
+share/man/man1/chwso.1.gz
+share/man/man1/ignw.1.gz
+share/man/man1/killw.1.gz
+share/man/man1/lsw.1.gz
+share/man/man1/mapw.1.gz
+share/man/man1/pfw.1.gz
+share/man/man1/slw.1.gz
+share/man/man1/wattr.1.gz
+share/man/man1/wmp.1.gz
+share/man/man1/wmutils.1.gz
+share/man/man1/wmv.1.gz
+share/man/man1/wrs.1.gz
+share/man/man1/wtf.1.gz
+share/man/man1/wtp.1.gz