diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index 5ede32283ad4..358f83971725 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -1,48 +1,60 @@
 PORTNAME=	qsstv
 PORTVERSION=	9.5.8
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio SSTV/FAX reception program for unix
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libhamlib.so:comms/hamlib \
 		libopenjp2.so:graphics/openjpeg \
 		libpulse.so:audio/pulseaudio \
 		libv4l2.so:multimedia/libv4l
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 
 USES=		compiler:c++11-lang gl pkgconfig qmake:outsource qt:5
 USE_QT=		buildtools core gui network widgets xml
 USE_GL=		gl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PLIST_FILES=	bin/qsstv \
+		share/applications/qsstv.desktop \
+		share/pixmaps/qsstv.png
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DEBUG)
+BUILD_DEPENDS+=	doxygen:devel/doxygen
+LIB_DEPENDS+=	libqwt6.so:x11-toolkits/qwt6
+PLIST_FILES+=	bin/qsstv.debug
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 			-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 			-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
 			-e 's|%%PERL%%|${PERL}|g' \
 		${WRKSRC}/qsstv.pro \
 		${WRKSRC}/config/directoriesconfig.cpp \
 		${WRKSRC}/documentation/manual/manual.doxy \
 		${WRKSRC}/documentation/manual/manual.txt \
 		${WRKSRC}/documentation/api/api.doxy
 	${RM} ${WRKSRC}/documentation/manual/manual.txt.*
 	${RM} ${WRKSRC}/documentation/manual/manual.*.orig
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/qsstv.desktop ${STAGEDIR}/${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icons/qsstv.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	-${RM} ${STAGEDIR}/${DOCSDIR}/manual.doxy
 	-${RM} ${STAGEDIR}/${DOCSDIR}/doxygen_sqlite3.db
 	-${RM} ${STAGEDIR}/${DOCSDIR}/*.bak
 	-${RM} ${STAGEDIR}/${DOCSDIR}/*.orig
 
 .include <bsd.port.mk>
diff --git a/comms/qsstv/files/patch-qsstv.pro b/comms/qsstv/files/patch-qsstv.pro
index 13c56086bec8..d3852f275732 100644
--- a/comms/qsstv/files/patch-qsstv.pro
+++ b/comms/qsstv/files/patch-qsstv.pro
@@ -1,11 +1,27 @@
 --- qsstv.pro.orig	2021-07-31 20:57:03 UTC
 +++ qsstv.pro
-@@ -523,7 +523,7 @@ QMAKE_EXTRA_TARGETS   +=   dox
+@@ -517,13 +517,13 @@ contains(QMAKE_HOST.arch, arm.*):{
+ 
+ 
+ 
+-dox.path=/usr/share/doc/$$TARGET
++dox.path=%%PREFIX%%/share/doc/$$TARGET
+ dox.files= $$PWD/manual/*
+ QMAKE_EXTRA_TARGETS   +=   dox
  
  
  isEmpty(PREFIX) {
 -        PREFIX = /usr/local
 +        PREFIX = %%PREFIX%%
      }
  target.path = $$PREFIX/bin
  
+@@ -605,6 +605,6 @@ FORMS   += scope/scopeoffset.ui \
+ 
+ FORMS   += scope/scopeoffset.ui \
+                 scope/plotform.ui
+-INCLUDEPATH += /usr/include/qwt /usr/include/qt5/qwt
+-LIBS += -lqwt-qt5
++INCLUDEPATH += %%PREFIX%%/include/qt5/qwt6
++LIBS += -L%%PREFIX%%/lib/qt5 -lqwt6
+ }
diff --git a/comms/qsstv/files/patch-utils_color.cpp b/comms/qsstv/files/patch-utils_color.cpp
deleted file mode 100644
index 8174690cee0b..000000000000
--- a/comms/qsstv/files/patch-utils_color.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/color.cpp.orig	2017-11-16 17:14:48 UTC
-+++ utils/color.cpp
-@@ -41,7 +41,7 @@
- #include <math.h>
- #include <assert.h>
- 
--#include "openjpeg.h"
-+#include "openjpeg-2.4/openjpeg.h"
- #include "color.h"
- 
- 
diff --git a/comms/qsstv/files/patch-utils_jp2io.h b/comms/qsstv/files/patch-utils_jp2io.h
deleted file mode 100644
index f0619483feab..000000000000
--- a/comms/qsstv/files/patch-utils_jp2io.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/jp2io.h.orig	2016-08-23 19:39:12 UTC
-+++ utils/jp2io.h
-@@ -1,6 +1,6 @@
- #ifndef JP2READER_H
- #define JP2READER_H
--#include "openjpeg.h"
-+#include "openjpeg-2.4/openjpeg.h"
- 
- #include <QString>
- #include <QImage>
diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist
deleted file mode 100644
index 043d1cb4ad58..000000000000
--- a/comms/qsstv/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/qsstv
-share/applications/qsstv.desktop
-share/pixmaps/qsstv.png