diff --git a/srcpkgs/nethack/template b/srcpkgs/nethack/template
index 20d5d4c2963..b7ec4c30753 100644
--- a/srcpkgs/nethack/template
+++ b/srcpkgs/nethack/template
@@ -1,6 +1,6 @@
 # Template file for 'nethack'
 pkgname=nethack
-version=3.6.2
+version=3.6.6
 revision=1
 make_dirs="/var/games/nethack/save 0775 nethack nethack"
 hostmakedepends="ncurses-devel flex"
@@ -9,10 +9,11 @@ short_desc="Exploring The Mazes of Menace"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="NGPL"
 homepage="http://www.nethack.org/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//.}-src.tgz"
-checksum=fbd00ada6a4ee347ecd4a350a5b2995b4b4ab5dcc63881b3bc4485b0479ddb1d
+distfiles="https://www.nethack.org/download/${version}/nethack-${version//./}-src.tgz"
+checksum=cfde0c3ab6dd7c22ae82e1e5a59ab80152304eb23fb06e3129439271e5643ed2
 nocross=yes
 system_accounts="$pkgname"
+wrksrc="NetHack-NetHack-${version}_Released"
 
 post_extract() {
 	sed -i	-e '/COMPRESS/s/compress/gzip/g' \
diff --git a/srcpkgs/nethack/update b/srcpkgs/nethack/update
index 52dbbe2d23c..8f8f9d801f1 100644
--- a/srcpkgs/nethack/update
+++ b/srcpkgs/nethack/update
@@ -1 +1,2 @@
-version="${version//./}"
+site='https://www.nethack.org/common/dnldindex.html'
+pattern='/\K\d+(.\d+)+'