diff --git a/x11/xforward/Makefile b/x11/xforward/Makefile
index e058f1aba42a..e9dc1efcb734 100644
--- a/x11/xforward/Makefile
+++ b/x11/xforward/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	xforward
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Provide user-level X forwarding service
 
 LICENSE_FILE=	${WRKSRC}/NOTICE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2
 
 USES=		motif xorg
 USE_XORG=	x11 xt xaw xmu xt xext sm ice xft xau xcb xdmcp xrender
 
 MAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 NO_WRKSUBDIR=	yes
-PLIST_FILES=	bin/xforward man/man1/xforward.1.gz
+PLIST_FILES=	bin/xforward share/man/man1/xforward.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xforward/files/patch-Makefile b/x11/xforward/files/patch-Makefile
index c2e78478a5ea..62b102409417 100644
--- a/x11/xforward/files/patch-Makefile
+++ b/x11/xforward/files/patch-Makefile
@@ -1,35 +1,36 @@
---- Makefile.orig	1993-06-04 19:32:01.000000000 -0700
-+++ Makefile	2023-02-14 20:39:04.842100000 -0800
-@@ -18,18 +18,19 @@
+diff -u Makefile.orig Makefile
+index c11964d..e1d0343 100644
+--- Makefile.orig
++++ Makefile
+@@ -18,17 +18,18 @@
  # MANDIR is where the manual page will be installed.
  
  DESTDIR=
 -BINDIR=/usr/local/bin
 -MANDIR=/usr/local/man/man1
 +BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man/man1
++MANDIR=${PREFIX}/share/man/man1
  
  # Where to find things
  # INCFLAGS lists directories to search for header files
  # LDFLAGS lists directories to search for libraries
  # LIBS lists the necessary libraries (Motif, Xt, X11)
  
 -INCFLAGS= -I/usr/lib/DXM/lib -I/usr/lib/DXM/lib/Xt
 -LDFLAGS= -L/usr/lib/DXM/lib/Xm -L/usr/lib/DXM/lib/Xt
 -LIBS= -lXm -lXt -lX11
 +INCFLAGS= -I${LOCALBASE}/include
 +LDFLAGS= -L${LOCALBASE}/lib
 +LIBS= -lXm -lXt -lX11 -lXext
- 
 +
+ 
  CFLAGS= ${INCFLAGS} -O
  
- # For CenterLine CodeCenter
-@@ -51,6 +52,7 @@
+@@ -51,6 +52,7 @@ xforward.o:	xforward.c
  install: ${PROGS}
  	install -c xforward ${DESTDIR}${BINDIR}/xforward
  	install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
 +
  clean: 	;
  	rm -f *~ *.o core ${PROGS}