diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile
index a761a0bd8d90..dbe4171369f9 100644
--- a/comms/qrq/Makefile
+++ b/comms/qrq/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	qrq
 PORTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/qrq/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Morse telegraphy trainer similar to the classic DOS version by DL4MM
 WWW=		https://fkurz.net/ham/qrq.html
 
 LICENSE=	GPLv2
 
 USES=		gmake ncurses shebangfix
 USE_CSTD=	c99
 
 SHEBANG_FILES=	qrqscore
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g'  \
 		-e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/qrq.c
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA}	${WRKSRC}/qrq.png ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/comms/qrq/files/patch-Makefile b/comms/qrq/files/patch-Makefile
index 341bab242a9c..fe787d72f2ef 100644
--- a/comms/qrq/files/patch-Makefile
+++ b/comms/qrq/files/patch-Makefile
@@ -1,104 +1,104 @@
 --- Makefile.orig	2022-01-22 09:18:24 UTC
 +++ Makefile
 @@ -2,13 +2,15 @@
  
  VERSION?=0.3.4
  DESTDIR?=/usr
 +PREFIX=%%PREFIX%%
 +LOCALBASE=%%LOCALBASE%%
  
  # set to YES if you want to use Core Audio
  # note that you must use Core Audio for OSX
  USE_CA=NO
  
  # set to YES if you want to use PulseAudio instead of OSS
 -USE_PA=YES
 +USE_PA=NO
  
  # set to YES if you compile with MINGW32
  USE_WIN32=NO
 @@ -27,8 +29,8 @@ endif
  
  ifeq ($(USE_WIN32), YES)
  	CC=i686-w64-mingw32-gcc-posix
 -else
 -	CC=gcc
 +#else
 +#	CC=gcc
  endif
  
  INSTALL ?= install
 @@ -38,7 +40,7 @@ INSTALL ?= install
  
  BUILD_INFO=" Date: $(shell date +%Y-%m-%dT%H:%M:%S%z)\n git branch/commit: $(shell if [ x${CI_COMMIT_REF_NAME} != x ]; then echo ${CI_COMMIT_REF_NAME} ; elif [ -e .git ] || [ -e ../.git ]; then git symbolic-ref --short HEAD ; else echo not built from git repository ; fi) / $(shell if [ x${CI_COMMIT_SHA} != x ]; then echo ${CI_COMMIT_SHA}; elif [ -e .git ] || [ -e ../.git ] ; then git rev-parse --verify HEAD ; else echo - ; fi )\n by $(USER)@$(shell hostname -f)\n OS: $(shell uname -s -r -p)\n Compiler: $(shell $(CC) --version | head -1)"
  
 -CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D BUILD_INFO=\"$(BUILD_INFO)\" -D VERSION=\"$(VERSION)\" -I.
 +CFLAGS:=$(CFLAGS) -I${LOCALBASE}/include -D DESTDIR=\"$(DESTDIR)\" -D BUILD_INFO=\"$(BUILD_INFO)\" -D VERSION=\"$(VERSION)\" -I.
  
  ifeq ($(USE_CA), YES)
  		CC=clang
 @@ -68,14 +70,14 @@ else ifeq ($(USE_WIN32), YES)
  		OBJECTS=qrq.o qrq.res lib/libncursesw.a
  else
  		OBJECTS=qrq.o oss.o
 -		LDFLAGS:=$(LDFLAGS) -lpthread -lncurses
 +		LDFLAGS:= $(LDFLAGS) -lpthread -lncurses
  		CFLAGS:=$(CFLAGS) -D OSS
  endif
  
  all: qrq
  
  qrq: $(OBJECTS)
 -	$(CC) -Wall -o $@ $^ -lm $(LDFLAGS)
 +	$(CC) -Wall -o $@ $^ -lm -L${LOCALBASE}/lib  $(LDFLAGS)
  	
  .c.o:
  	$(CC) -Wall $(CPPFLAGS) $(CFLAGS) -c $<
 @@ -109,28 +111,28 @@ uninstall:
  else
  
  install: qrq
 -	${INSTALL} -d -v                      $(DESTDIR)/share/qrq/
 -	${INSTALL} -d -v                      $(DESTDIR)/share/man/man1/
 -	${INSTALL} -d -v                      $(DESTDIR)/bin/
 -	${INSTALL} -s -m 0755 qrq             $(DESTDIR)/bin/
 -	${INSTALL}    -m 0755 qrqscore        $(DESTDIR)/bin/
 -	${INSTALL}    -m 0644 qrq.1           $(DESTDIR)/share/man/man1/
 -	${INSTALL}    -m 0644 callbase.qcb    $(DESTDIR)/share/qrq/
 -	${INSTALL}    -m 0644 english.qcb     $(DESTDIR)/share/qrq/
 -	${INSTALL}    -m 0644 cwops.qcb       $(DESTDIR)/share/qrq/
 -	${INSTALL}    -m 0644 qrqrc           $(DESTDIR)/share/qrq/
 -	${INSTALL}    -m 0644 toplist         $(DESTDIR)/share/qrq/
 +	${INSTALL} -d -v                      $(DESTDIR)${PREFIX}/share/qrq/
 +	${INSTALL} -d -v                      $(DESTDIR)${PREFIX}/man/man1/
 +	${INSTALL} -d -v                      $(DESTDIR)${PREFIX}/bin/
 +	${INSTALL} -s -m 0755 qrq             $(DESTDIR)${PREFIX}/bin/
 +	${INSTALL}    -m 0755 qrqscore        $(DESTDIR)${PREFIX}/bin/
-+	${INSTALL}    -m 0644 qrq.1           $(DESTDIR)${PREFIX}/man/man1/
++	${INSTALL}    -m 0644 qrq.1           $(DESTDIR)${PREFIX}/share/man/man1/
 +	${INSTALL}    -m 0644 callbase.qcb    $(DESTDIR)${PREFIX}/share/qrq/
 +	${INSTALL}    -m 0644 english.qcb     $(DESTDIR)${PREFIX}/share/qrq/
 +	${INSTALL}    -m 0644 cwops.qcb       $(DESTDIR)${PREFIX}/share/qrq/
 +	${INSTALL}    -m 0644 qrqrc           $(DESTDIR)${PREFIX}/share/qrq/
 +	${INSTALL}    -m 0644 toplist         $(DESTDIR)${PREFIX}/share/qrq/
  
  	
  uninstall:
 -	rm -f $(DESTDIR)/bin/qrq
 -	rm -f $(DESTDIR)/bin/qrqscore
 -	rm -f $(DESTDIR)/share/man/man1/qrq.1
 -	rm -f $(DESTDIR)/share/qrq/callbase.qcb
 -	rm -f $(DESTDIR)/share/qrq/english.qcb
 -	rm -f $(DESTDIR)/share/qrq/qrqrc
 -	rm -f $(DESTDIR)/share/qrq/toplist
 -	rmdir $(DESTDIR)/share/qrq/
 +	rm -f $(DESTDIR)${PREFIX}/bin/qrq
 +	rm -f $(DESTDIR)${PREFIX}/bin/qrqscore
 +	rm -f $(DESTDIR)${PREFIX}/share/man/man1/qrq.1
 +	rm -f $(DESTDIR)${PREFIX}/share/qrq/callbase.qcb
 +	rm -f $(DESTDIR)${PREFIX}/share/qrq/english.qcb
 +	rm -f $(DESTDIR)${PREFIX}/share/qrq/qrqrc
 +	rm -f $(DESTDIR)${PREFIX}/share/qrq/toplist
 +	rmdir $(DESTDIR)${PREFIX}/share/qrq/
  
  endif
  
diff --git a/comms/qrq/pkg-plist b/comms/qrq/pkg-plist
index 8f9a7434a96f..e8afa51b89be 100644
--- a/comms/qrq/pkg-plist
+++ b/comms/qrq/pkg-plist
@@ -1,9 +1,9 @@
 bin/qrq
 bin/qrqscore
-man/man1/qrq.1.gz
+share/man/man1/qrq.1.gz
 %%DATADIR%%/cwops.qcb
 %%DATADIR%%/callbase.qcb
 %%DATADIR%%/english.qcb
 %%DATADIR%%/qrqrc
 %%DATADIR%%/qrq.png
 %%DATADIR%%/toplist