diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index 9f2369b0d1ba..564313e5ec28 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -1,34 +1,33 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	nagstamon
 PORTVERSION=	3.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 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 b521f79aed27..e5f6be377d36 100644
--- a/net-mgmt/nagstamon/distinfo
+++ b/net-mgmt/nagstamon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618000902
-SHA256 (HenriWahl-Nagstamon-v3.6.0-latest_GH0.tar.gz) = 09cd5ffb56a7f70f7b46af2a02d57b68c303d567933ef3b3c04565342ad53ff0
-SIZE (HenriWahl-Nagstamon-v3.6.0-latest_GH0.tar.gz) = 574044
+TIMESTAMP = 1618330999
+SHA256 (HenriWahl-Nagstamon-v3.6.0_GH0.tar.gz) = 5ec74c50367ba75af417e04c8192b6f598a1db9e55e2db52a8dc540ac707d904
+SIZE (HenriWahl-Nagstamon-v3.6.0_GH0.tar.gz) = 573998