diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index 7a9d55f9fb2f..9f2369b0d1ba 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -1,32 +1,34 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	nagstamon
-PORTVERSION=	3.6
+PORTVERSION=	3.6.0
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Nagios status monitor for your desktop
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-kerberos>0:security/py-requests-kerberos@${PY_FLAVOR}
 
 USES=		cpe pyqt:5 python:3.6+
 CPE_VENDOR=	henri_wahl
 USE_GITHUB=	yes
 GH_ACCOUNT=	HenriWahl
 GH_PROJECT=	Nagstamon
 GH_TAGNAME=	latest
 USE_PYQT=	core_run dbus_run gui_run multimedia_run network_run sip_run \
 		svg_run widgets_run
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagstamon/distinfo b/net-mgmt/nagstamon/distinfo
index 9baa56bb2e83..b521f79aed27 100644
--- a/net-mgmt/nagstamon/distinfo
+++ b/net-mgmt/nagstamon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617381409
-SHA256 (HenriWahl-Nagstamon-3.6-latest_GH0.tar.gz) = dc4ee2a70e659d4832aec4e344f2567718e9c5366d162e2a578c142f5d100af3
-SIZE (HenriWahl-Nagstamon-3.6-latest_GH0.tar.gz) = 573799
+TIMESTAMP = 1618000902
+SHA256 (HenriWahl-Nagstamon-v3.6.0-latest_GH0.tar.gz) = 09cd5ffb56a7f70f7b46af2a02d57b68c303d567933ef3b3c04565342ad53ff0
+SIZE (HenriWahl-Nagstamon-v3.6.0-latest_GH0.tar.gz) = 574044