diff --git a/games/nethack36/Makefile b/games/nethack36/Makefile
index 6a0932a3e818..3207ad354ba1 100644
--- a/games/nethack36/Makefile
+++ b/games/nethack36/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nethack36
-PORTVERSION=	3.6.2
-PORTREVISION=	1
+PORTVERSION=	3.6.4
 CATEGORIES=	games
 MASTER_SITES=	https://nethack.org/download/${PORTVERSION}/
 DISTNAME=	${TRUEPORTNAME}-${PORTVERSION:S/.//g}-src
@@ -18,7 +17,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		alias compiler:c11 gmake ncurses tar:tgz
 
-WRKSRC=		${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/NetHack-NetHack-${PORTVERSION}_Released
 
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
diff --git a/games/nethack36/distinfo b/games/nethack36/distinfo
index ec09801dfcae..8621af98309a 100644
--- a/games/nethack36/distinfo
+++ b/games/nethack36/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557992328
-SHA256 (nethack-362-src.tgz) = fbd00ada6a4ee347ecd4a350a5b2995b4b4ab5dcc63881b3bc4485b0479ddb1d
-SIZE (nethack-362-src.tgz) = 4908750
+TIMESTAMP = 1577729401
+SHA256 (nethack-364-src.tgz) = 0531ab8466032611d61f702cb71fb3ceca78a7a4918885c1b4f2f17cb57dbd59
+SIZE (nethack-364-src.tgz) = 5573777