diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 46eb989c3a80..39f2f8bff906 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	amiwm
 PORTVERSION=	0.22.pl2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://ftp.lysator.liu.se/pub/X11/wm/amiwm/
 DISTNAME=	${PORTNAME}0.22pl2
 
 MAINTAINER=	dcarmich@dcarmichael.net
 COMMENT=	Window manager that makes your desktop look like an Amiga(TM)
 WWW=		https://www.lysator.liu.se/~marcus/amiwm.html
 
 USES=		shebangfix xorg
 SHEBANG_FILES=	Xinitrc.in \
 		Xsession.in \
 		Xsession2.in
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	ice sm x11 xext xmu
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${ECHO_MSG} "===>  Copying documents to ${DOCSDIR}"
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/README.modules ${STAGEDIR}${DOCSDIR}/README.modules
 
 .include <bsd.port.mk>
diff --git a/x11-wm/amiwm/files/patch-Makefile.in b/x11-wm/amiwm/files/patch-Makefile.in
index 83dd1a3991ec..c00867e33bf7 100644
--- a/x11-wm/amiwm/files/patch-Makefile.in
+++ b/x11-wm/amiwm/files/patch-Makefile.in
@@ -1,64 +1,73 @@
---- Makefile.in.orig	2010-07-20 00:07:34.000000000 +0800
-+++ Makefile.in	2014-07-02 09:42:52.170996007 +0800
-@@ -43,7 +43,7 @@ DISTFILES = README README.modules INSTAL
+--- Makefile.in.orig	2023-04-16 16:11:41 UTC
++++ Makefile.in
+@@ -14,7 +14,7 @@ libdir = $(exec_prefix)/lib
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+ libdir = $(exec_prefix)/lib
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+ INSTALL = @INSTALL@
+ LN_S = @LN_S@
+ RM = -rm -f
+@@ -44,7 +44,7 @@ PACKAGENAME = amiwm
  
  PACKAGENAME = amiwm
  
 -AMIWM_HOME = $(libdir)/amiwm
 +AMIWM_HOME = $(libdir)/X11/amiwm
  
  all : lib_all
  	@$(MAKE) local_all
-@@ -88,32 +88,32 @@ kbdlexer.c : kbdlexer.l
+@@ -89,32 +89,32 @@ install : $(PROGS) $(MODULES) Xsession Xsession2 Xinit
  	$(LEX) -t $< > kbdlexer.c
  
  install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
 -	-mkdir -p $(AMIWM_HOME)
 -	$(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice
 -	$(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd
 +	-mkdir -p $(DESTDIR)$(AMIWM_HOME)
 +	$(INSTALL) $(STRIPFLAG) requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
 +	$(INSTALL) $(STRIPFLAG) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd
  	for module in $(MODULES); do \
  	  if [ "$$module" = "$(srcdir)/Background" ]; then \
 -	    $(INSTALL) $$module $(AMIWM_HOME)/Background; \
 +	    $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \
  	  else \
 -	    $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \
 +	    $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
  	  fi; \
  	done
 -	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
 -	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info
 -	$(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map
 -	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map
 -	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map
 -	$(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
 -	$(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
 -	$(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
 -	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init
 -	-mkdir -p $(bindir)
 -	$(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm
 -	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo
 +	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
 +	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
 +	$(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map
 +	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
 +	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
 +	$(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
 +	$(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
 +	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
 +	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init
 +	-mkdir -p $(DESTDIR)$(bindir)
 +	$(INSTALL) $(STRIPFLAG) amiwm $(DESTDIR)$(bindir)/amiwm
 +	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo
  	$(RM) $(bindir)/requestchoice
 -	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
 -	-mkdir -p $(mandir)/man1
 -	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1
 +	$(LN_S) $(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice
 +	-mkdir -p $(DESTDIR)$(mandir)/man1
 +	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
  
  fs-install : Filesystem
  	$(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem
diff --git a/x11-wm/amiwm/pkg-plist b/x11-wm/amiwm/pkg-plist
index 101aeda8b12a..e284fb68c7bf 100644
--- a/x11-wm/amiwm/pkg-plist
+++ b/x11-wm/amiwm/pkg-plist
@@ -1,20 +1,20 @@
 bin/amiwm
 bin/ppmtoinfo
 bin/requestchoice
 lib/X11/amiwm/Background
 lib/X11/amiwm/Keyboard
 lib/X11/amiwm/Launcher
 lib/X11/amiwm/Xinitrc
 lib/X11/amiwm/Xsession
 lib/X11/amiwm/Xsession2
 lib/X11/amiwm/amiwm-init
 lib/X11/amiwm/def_tool.info
 lib/X11/amiwm/executecmd
 lib/X11/amiwm/magicwb.map
 lib/X11/amiwm/requestchoice
 lib/X11/amiwm/schwartz.map
 lib/X11/amiwm/system.amiwmrc
 lib/X11/amiwm/system.map
-man/man1/amiwm.1.gz
+share/man/man1/amiwm.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.modules