diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile
index eab6354a0b86..c35aeb49ed00 100644
--- a/comms/direwolf/Makefile
+++ b/comms/direwolf/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	direwolf
 DISTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	a30f90956b81feeb65007828c27617df1ce9f052.patch:-p1 \
+		e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch:-p1 \
+		6bfd22811c329539111ed72bafc1d18514af8a74.patch:-p1 \
+		5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch:-p1 \
+		42314b7219ec266697396c7a4b61afe91be9b92c.patch:-p1 \
+		27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch:-p1
+
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Software "soundcard" modem/TNC and APRS encoder/decoder
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib\
-		libhamlib.so:comms/hamlib \
 		libgps.so:astro/gpsd \
+		libhamlib.so:comms/hamlib \
 		libportaudio.so:audio/portaudio
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		cmake:noninja python shebangfix
+USES=		cmake python shebangfix pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wb2osz
-GH_TAGNAME=	1.6
-
-SHEBANG_FILES=	scripts/telemetry-toolkit/telem-bits.pl \
-		scripts/telemetry-toolkit/telem-parm.pl\
-		scripts/telemetry-toolkit/telem-eqns.pl \
-		scripts/dwespeak.sh \
-		scripts/telemetry-toolkit/telem-data.pl \
-		scripts/telemetry-toolkit/telem-data91.pl \
-		scripts/telemetry-toolkit/telem-unit.pl	\
-		scripts/telemetry-toolkit/telem-balloon.pl\
-		scripts/dw-start.sh \
-		scripts/telemetry-toolkit/telem-volts.py
+
+SHEBANG_FILES=	scripts
+TARGET_ORDER_OVERRIDE=	610:fix-shebang
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'\
-		${WRKSRC}/scripts/dw-start.sh
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'\
+		-e 's|/var/tmp|/var/log|' ${WRKSRC}/scripts/dw-start.sh
 
 .include <bsd.port.mk>
diff --git a/comms/direwolf/distinfo b/comms/direwolf/distinfo
index 7cda7bd39059..0185a9b3071d 100644
--- a/comms/direwolf/distinfo
+++ b/comms/direwolf/distinfo
@@ -1,3 +1,15 @@
-TIMESTAMP = 1639707044
+TIMESTAMP = 1646509148
 SHA256 (wb2osz-direwolf-1.6_GH0.tar.gz) = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
 SIZE (wb2osz-direwolf-1.6_GH0.tar.gz) = 22298168
+SHA256 (a30f90956b81feeb65007828c27617df1ce9f052.patch) = 1d755aa6cfd4407e7ac3075f8010da52453b10b61e5ba39cb8c97b95c19b9c81
+SIZE (a30f90956b81feeb65007828c27617df1ce9f052.patch) = 830
+SHA256 (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 3c92308229acbac31e65867b0c6234aa7cc8056a953bcd44d008a9b5eab1987c
+SIZE (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 1246
+SHA256 (6bfd22811c329539111ed72bafc1d18514af8a74.patch) = db2a520f0ee7a3c066bf3db308dd27cb09bba198c959f564f9a3bc52d042d22c
+SIZE (6bfd22811c329539111ed72bafc1d18514af8a74.patch) = 67043
+SHA256 (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = c1e31fbfc18399e3dacc1fc821e2720ab0793337eba3841e110a37b3f9251a20
+SIZE (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = 2910
+SHA256 (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 58c0d62f778e2598ae68a8f5d734ee6ac71e786763cabb616189533b8aae2dc0
+SIZE (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 18991
+SHA256 (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = bbfe2caf64ca9fccc796ca61a381ce4e7eedf4bd8d0b7522c6090766daf71e13
+SIZE (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = 1963
diff --git a/comms/direwolf/files/patch-scripts_dw-start.sh b/comms/direwolf/files/patch-scripts_dw-start.sh
index 974c7f92c6d8..be35586236a9 100644
--- a/comms/direwolf/files/patch-scripts_dw-start.sh
+++ b/comms/direwolf/files/patch-scripts_dw-start.sh
@@ -1,29 +1,23 @@
---- scripts/dw-start.sh.orig	2021-12-17 15:56:10 UTC
+--- scripts/dw-start.sh.orig	2022-01-28 14:55:02 UTC
 +++ scripts/dw-start.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/bash
-+#!%%PREFIX%%/bin/bash
+@@ -68,9 +68,9 @@ DWCMD="$DIREWOLF -a 100"
  
- # Why not simply "#!/bin/bash" ?
  
-@@ -133,14 +133,14 @@ function GUI {
-    # Auto adjust the startup for your particular environment:  gnome-terminal, xterm, etc.
-    #
+ #Where will logs go - needs to be writable by non-root users
+-LOGFILE=/var/tmp/dw-start.log
++#LOGFILE=/var/tmp/dw-start.log
++LOGFILE=/var/var/dw-start.log
  
--   if [ -x /usr/bin/lxterminal ]; then
--      /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
-+   if [ -x %%PREFIX%%/bin/lxterminal ]; then
-+      %%PREFIX%%/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
-       SUCCESS=1
--     elif [ -x /usr/bin/xterm ]; then
--      /usr/bin/xterm -bg white -fg black -e "$DWCMD" &
-+     elif [ -x %%PREFIX%%/bin/xterm ]; then
-+      %%PREFIX%%/bin/xterm -bg white -fg black -e "$DWCMD" &
-       SUCCESS=1
--     elif [ -x /usr/bin/x-terminal-emulator ]; then
--      /usr/bin/x-terminal-emulator -e "$DWCMD" &
-+     elif [ -x %%PREFIX%%/bin/x-terminal-emulator ]; then
-+      %%PREFIX%%/bin/x-terminal-emulator -e "$DWCMD" &
-       SUCCESS=1
-      else
-       echo "Did not find an X terminal emulator.  Reverting to CLI mode"
+-
+ #-------------------------------------
+ # Main functions of the script
+ #-------------------------------------
+@@ -157,7 +157,7 @@ function GUI {
+ # When running from cron, we have a very minimal environment
+ # including PATH=/usr/bin:/bin.
+ #
+-export PATH=/usr/local/bin:$PATH
++export PATH=%%PREFIX%%/bin:$PATH
+ 
+ #Log the start of the script run and re-run
+ date >> $LOGFILE
diff --git a/comms/direwolf/pkg-descr b/comms/direwolf/pkg-descr
index 26e72fd5bf6c..0321d05f86d6 100644
--- a/comms/direwolf/pkg-descr
+++ b/comms/direwolf/pkg-descr
@@ -1,6 +1,8 @@
 Dire Wolf is a software "soundcard" modem/TNC and APRS encoder/decoder.
 It can be used stand-alone to observe APRS traffic, as a digipeater,
 APRStt gateway, or Internet Gateway (IGate).  It can also be used as a
 virtual TNC for other applications such as APRSIS32, UI-View32, Xastir,
 APRS-TW, YAAC, UISS, Linux AX25, SARTrack, RMS Express, BPQ32, Outpost
 PM, and many others.
+
+WWW: https://github.com/wb2osz/direwolf