diff --git a/x11/wvkbd/Makefile b/x11/wvkbd/Makefile
index 71d39f521f21..f53efcacd12c 100644
--- a/x11/wvkbd/Makefile
+++ b/x11/wvkbd/Makefile
@@ -1,46 +1,48 @@
 PORTNAME=	wvkbd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7
+DISTVERSION=	0.8.2
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	On-screen keyboard for wlroots
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland
 
 USES=		gmake gnome pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo pango
 GH_ACCOUNT=	jjsullivan5196
 MAKE_ARGS=	VERSION="${DISTVERSIONFULL}"
-PLIST_FILES=	bin/${PORTNAME}-mobintl
+PLIST_FILES=	bin/${PORTNAME}-mobintl \
+		share/man/man1/${PORTNAME}.1.gz
 LDFLAGS+=	-Wl,--as-needed # pango deps
 
 pre-everything::
 	@${ECHO_MSG} "To build ${PORTNAME} with your own config.h set ${PORTNAME:tu}_CONF variable"
 	@${ECHO_MSG} "either in ${.CURDIR:T}/Makefile.local, make.conf(5), environ(7) or command line e.g.,"
 	@${ECHO_MSG} "\$$ make install clean ${PORTNAME:tu}_CONF=/path/to/${PORTNAME}/config.h"
 
 post-extract:
 # .if exists(...) before bsd.port.mk ignores *_CONF in make.conf(5) and Makefile.local
 	@if [ -e "${${PORTNAME:tu}_CONF}" ]; then \
 		${ECHO_MSG} "Creating symlink: config.h -> ${${PORTNAME:tu}_CONF}"; \
 		${LN} -fs "${${PORTNAME:tu}_CONF}" ${WRKSRC}/config.h; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^PKGS/s/$$/ epoll-shim/' \
 		-e 's/ xkbcommon//' \
-		-e '/^LDFLAGS/s/=/+=/' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} '/^CFLAGS/s/=/+=/' ${WRKSRC}/config.mk
+	@${REINPLACE_CMD} -e '/^PREFIX/s/=/?=/' \
+		-e '/^CFLAGS/s/=/+=/' \
+		${WRKSRC}/config.mk
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}*
 
 .include <bsd.port.mk>
diff --git a/x11/wvkbd/distinfo b/x11/wvkbd/distinfo
index 63785b66ec39..924ef9ef67e2 100644
--- a/x11/wvkbd/distinfo
+++ b/x11/wvkbd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641790966
-SHA256 (jjsullivan5196-wvkbd-v0.7_GH0.tar.gz) = b5d3c8bd97ef6cdd962fcee2ca9593f16569dca322a89c408d704718735cc18e
-SIZE (jjsullivan5196-wvkbd-v0.7_GH0.tar.gz) = 1055772
+TIMESTAMP = 1655491688
+SHA256 (jjsullivan5196-wvkbd-v0.8.2_GH0.tar.gz) = f9c689fce7e0b119b078d370385c868c5b579a4ec1e1b5610befa4b19c062e28
+SIZE (jjsullivan5196-wvkbd-v0.8.2_GH0.tar.gz) = 1072574