diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile
index f4873bfe58d8..cbafd38641c8 100644
--- a/comms/nanovna-saver/Makefile
+++ b/comms/nanovna-saver/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	nanovna-saver
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.10
-PORTREVISION=	2
+DISTVERSION=	0.4.0
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Multiplatform tool to save Touchstone files from the NanoVNA
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.3+ pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	pyqt5_run
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	mihtjel
+GH_ACCOUNT=	NanoVNA-Saver
 
 NO_ARCH=	yes
 
 post-extract:
 	${CP} ${FILESDIR}/Sysctl.py ${WRKSRC}/NanoVNASaver/Hardware/
 
 .include <bsd.port.mk>
diff --git a/comms/nanovna-saver/distinfo b/comms/nanovna-saver/distinfo
index 4d12dbe4d6ec..47e388769df9 100644
--- a/comms/nanovna-saver/distinfo
+++ b/comms/nanovna-saver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641829596
-SHA256 (mihtjel-nanovna-saver-v0.3.10_GH0.tar.gz) = 202c907125015e2fb26926ef1ce365321d749207a74e3029e729e89e50acda88
-SIZE (mihtjel-nanovna-saver-v0.3.10_GH0.tar.gz) = 477821
+TIMESTAMP = 1657834718
+SHA256 (NanoVNA-Saver-nanovna-saver-v0.4.0_GH0.tar.gz) = df1a68f0a6cb2f686b34860761cb3a36061b2f184c8e5bc72b590c04a140e62f
+SIZE (NanoVNA-Saver-nanovna-saver-v0.4.0_GH0.tar.gz) = 488898
diff --git a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py
index 970c3e21cebe..2ffb91e85f22 100644
--- a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py
+++ b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py
@@ -1,30 +1,42 @@
---- NanoVNASaver/Hardware/Hardware.py.orig	2022-01-04 07:44:03 UTC
+--- NanoVNASaver/Hardware/Hardware.py.orig	2022-04-01 14:51:11 UTC
 +++ NanoVNASaver/Hardware/Hardware.py
 @@ -34,6 +34,7 @@ from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H
  from NanoVNASaver.Hardware.NanoVNA_V2 import NanoVNA_V2
  from NanoVNASaver.Hardware.TinySA import TinySA
  from NanoVNASaver.Hardware.Serial import drain_serial, Interface
 +from NanoVNASaver.Hardware.Sysctl import usb_vid_pid
  
  
  logger = logging.getLogger(__name__)
 @@ -80,6 +81,11 @@ def get_interfaces() -> List[Interface]:
      for d in list_ports.comports():
          if platform.system() == 'Windows' and d.vid is None:
              d = _fix_v2_hwinfo(d)
 +        if platform.system() == 'FreeBSD':
 +            logger.debug("Found FreeBSD USB port %s", d.device)
 +            vid_pid = usb_vid_pid(d.device)
 +            d.vid = vid_pid[0]
 +            d.pid = vid_pid[1]
          for t in USBDEVICETYPES:
              if d.vid != t.vid or d.pid != t.pid:
                  continue
-@@ -94,7 +100,6 @@ def get_interfaces() -> List[Interface]:
+@@ -87,14 +93,17 @@ def get_interfaces() -> List[Interface]:
+                          t.name, d.vid, d.pid, d.device)
+             iface = Interface('serial', t.name)
+             iface.port = d.device
+-            iface.open()
++            try:
++                iface.open()
++            except serial.SerialException:
++                logger.warning("Could not open serial port %s", d.device)
++                continue
+             iface.comment = get_comment(iface)
+             iface.close()
+             interfaces.append(iface)
  
      logger.debug("Interfaces: %s", interfaces)
      return interfaces
 -
  
  def get_VNA(iface: Interface) -> 'VNA':
      # serial_port.timeout = TIMEOUT
diff --git a/comms/nanovna-saver/pkg-descr b/comms/nanovna-saver/pkg-descr
index bca547b9d86f..ec8fafa9676f 100644
--- a/comms/nanovna-saver/pkg-descr
+++ b/comms/nanovna-saver/pkg-descr
@@ -1,7 +1,7 @@
 NanoVNASaver
 
 A multiplatform tool to save Touchstone files from the NanoVNA, sweep
 frequency spans in segments to gain more than 101 data points, and
 generally display and analyze the resulting data.
 
-WWW: https://github.com/mihtjel/nanovna-saver
+WWW: https://github.com/NanoVNA-Saver/nanovna-saver