diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index a3e92bfa761..d59b2bd4cfb 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,8 +1,8 @@
 # Template file for 'nagstamon'
 pkgname=nagstamon
-version=3.4.1
-revision=2
-wrksrc=Nagstamon
+version=3.6.0
+revision=1
+wrksrc="Nagstamon-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-keyring python3-psutil"
 depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
@@ -10,9 +10,11 @@ depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
 short_desc="Nagios status monitor for the desktop"
 maintainer="Laszlo Dvornik <laulicus@zoho.com>"
 license="GPL-2.0-or-later"
-homepage="https://nagstamon.ifw-dresden.de"
-distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=7a9611f40b08269bba4100ab2598ee089c7d0ebc6c4e9d7132689342f71150ec
+homepage="https://nagstamon.de"
+distfiles="https://github.com/HenriWahl/Nagstamon/archive/v${version}.tar.gz"
+checksum=5ec74c50367ba75af417e04c8192b6f598a1db9e55e2db52a8dc540ac707d904
+# Tarball includes no tests
+make_check=no
 
 post_patch() {
 	# This relies on /etc/os-release, which doesn't exist without