diff --git a/games/nethack36/Makefile b/games/nethack36/Makefile
index 6a0932a3e..3207ad354 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 ec09801df..63a53919d 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 = 1577684548
+SHA256 (nethack-364-src.tgz) = 0531ab8466032611d61f702cb71fb3ceca78a7a4918885c1b4f2f17cb57dbd59
+SIZE (nethack-364-src.tgz) = 5573777
diff --git a/games/nethack36/files/patch-dgn_comp.6 b/games/nethack36/files/patch-dgn_comp.6
deleted file mode 100644
index 02ae84b6f..000000000
--- a/games/nethack36/files/patch-dgn_comp.6
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/dgn_comp.6.orig	Mon Apr 12 09:28:09 2004
-+++ doc/dgn_comp.6	Mon Apr 12 09:28:33 2004
-@@ -396,7 +396,7 @@
- M. Stephenson (from the level compiler by Jean-Christophe Collet).
- .SH "SEE ALSO"
- .PP
--lev_comp(6), nethack(6)
-+lev_comp%%HACKEXT%%(6), %%HACKNAME%%(6)
- .SH BUGS
- .PP
- Probably infinite.
diff --git a/games/nethack36/files/patch-dlb.6 b/games/nethack36/files/patch-dlb.6
deleted file mode 100644
index 14d52abc9..000000000
--- a/games/nethack36/files/patch-dlb.6
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/dlb.6.orig	Mon Apr 12 09:28:09 2004
-+++ doc/dlb.6	Mon Apr 12 09:28:54 2004
-@@ -74,7 +74,7 @@
- Kenneth Lorber
- .SH "SEE ALSO"
- .PP
--nethack(6), tar(1)
-+%%HACKNAME%%(6), tar(1)
- .SH BUGS
- .PP
- Not a good tar emulation; - does not mean stdin or stdout.
diff --git a/games/nethack36/files/patch-doc_dgn__comp.6 b/games/nethack36/files/patch-doc_dgn__comp.6
new file mode 100644
index 000000000..e5ab0c1a2
--- /dev/null
+++ b/games/nethack36/files/patch-doc_dgn__comp.6
@@ -0,0 +1,11 @@
+--- doc/dgn_comp.6.orig	2019-12-18 20:29:40 UTC
++++ doc/dgn_comp.6
+@@ -409,7 +409,7 @@ it is in only applies to non-special levels within tha
+ M. Stephenson (from the level compiler by Jean-Christophe Collet).
+ .SH "SEE ALSO"
+ .PP
+-lev_comp(6), nethack(6)
++lev_comp36(6), nethack36(6)
+ .SH BUGS
+ .PP
+ Probably infinite.
diff --git a/games/nethack36/files/patch-doc_dlb.6 b/games/nethack36/files/patch-doc_dlb.6
new file mode 100644
index 000000000..684abd449
--- /dev/null
+++ b/games/nethack36/files/patch-doc_dlb.6
@@ -0,0 +1,11 @@
+--- doc/dlb.6.orig	2019-12-18 20:29:40 UTC
++++ doc/dlb.6
+@@ -96,7 +96,7 @@ List the contents of the archive 'foo':
+ Kenneth Lorber
+ .SH "SEE ALSO"
+ .PP
+-nethack(6), tar(1)
++nethack36(6), tar(1)
+ .SH BUGS
+ .PP
+ Not a good tar emulation; - does not mean stdin or stdout.
diff --git a/games/nethack36/files/patch-doc_lev__comp.6 b/games/nethack36/files/patch-doc_lev__comp.6
new file mode 100644
index 000000000..16aff303a
--- /dev/null
+++ b/games/nethack36/files/patch-doc_lev__comp.6
@@ -0,0 +1,11 @@
+--- doc/lev_comp.6.orig	2019-12-18 20:29:40 UTC
++++ doc/lev_comp.6
+@@ -577,7 +577,7 @@ level, regardless of the placement of the current MAP 
+ Jean-Christophe Collet, David Cohrs.
+ .SH "SEE ALSO"
+ .PP
+-dgn_comp(6), nethack(6)
++dgn_comp36(6), nethack36(6)
+ .SH BUGS
+ .PP
+ Probably infinite.
diff --git a/games/nethack36/files/patch-nethack.6 b/games/nethack36/files/patch-doc_nethack.6
similarity index 64%
rename from games/nethack36/files/patch-nethack.6
rename to games/nethack36/files/patch-doc_nethack.6
index 0803a36e8..bcf321d2b 100644
--- a/games/nethack36/files/patch-nethack.6
+++ b/games/nethack36/files/patch-doc_nethack.6
@@ -1,38 +1,38 @@
---- doc/nethack.6.orig	2018-04-27 05:07:22.000000000 -0700
-+++ doc/nethack.6	2019-03-12 14:51:23.925413000 -0700
-@@ -17,7 +17,7 @@
+--- doc/nethack.6.orig	2019-12-18 20:29:40 UTC
++++ doc/nethack.6
+@@ -17,7 +17,7 @@ nethack \- Exploring The Mazes of Menace
  .SH SYNOPSIS
  .na
  .hy 0
 -.B nethack
-+.B %%HACKNAME%%
++.B nethack36
  [
  .B \-d
  .I directory
-@@ -216,7 +216,7 @@
+@@ -219,7 +219,7 @@ option, which must be the first argument if it appears
  supplies a directory which is to serve as the playground.
  It overrides the value from NETHACKDIR, HACKDIR,
  or the directory specified by the game administrator during compilation
 -(usually /usr/games/lib/nethackdir).
-+(usually %%HACKDIR%%).
++(usually /usr/local/share/nethack36).
  This option is usually only useful to the game administrator.
  The playground must contain several auxiliary files such as help files,
  the list of top scorers, and a subdirectory
-@@ -258,7 +258,7 @@
+@@ -265,7 +265,7 @@ name is '.nethackrc' in the user's home directory.
  
  .br
  All other files are in the playground directory,
 -normally /usr/games/lib/nethackdir.
-+normally %%HACKDIR%%.
++normally /usr/local/share/nethack36.
  If DLB was defined during the compile, the data files and special levels
  will be inside a larger file, normally nhdat, instead of being separate
  files.
-@@ -386,7 +386,7 @@
+@@ -393,7 +393,7 @@ SHOPTYPE and SPLEVTYPE can be used in debugging (wizar
  DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
  .SH "SEE ALSO"
  .PP
 -dgn_comp(6), lev_comp(6), recover(6)
-+dgn_comp%%HACKEXT%%(6), lev_comp%%HACKEXT%%(6), recover%%HACKEXT%%(6)
++dgn_comp36(6), lev_comp36(6), recover36(6)
  .SH BUGS
  .PP
  Probably infinite.
diff --git a/games/nethack36/files/patch-recover.6 b/games/nethack36/files/patch-doc_recover.6
similarity index 58%
rename from games/nethack36/files/patch-recover.6
rename to games/nethack36/files/patch-doc_recover.6
index 912671839..71f429b38 100644
--- a/games/nethack36/files/patch-recover.6
+++ b/games/nethack36/files/patch-doc_recover.6
@@ -1,20 +1,20 @@
---- doc/recover.6.orig	Mon Apr 12 09:28:09 2004
-+++ doc/recover.6	Mon Apr 12 09:31:27 2004
-@@ -31,7 +31,7 @@
+--- doc/recover.6.orig	2019-12-18 20:29:40 UTC
++++ doc/recover.6
+@@ -43,7 +43,7 @@ option, which must be the first argument if it appears
  supplies a directory which is the NetHack playground.
  It overrides the value from NETHACKDIR, HACKDIR, or the directory
  specified by the game administrator during compilation
 -(usually /usr/games/lib/nethackdir).
-+(usually %%HACKDIR%%).
++(usually /usr/local/share/nethack36).
  .PP
+ ^?ALLDOCS
  For recovery to be possible,
- .I nethack
-@@ -103,7 +103,7 @@
+@@ -130,7 +130,7 @@ but even a compression-using
  .I nethack
  will find them in the uncompressed form.
  .SH "SEE ALSO"
 -nethack(6)
-+%%HACKNAME%%(6)
++nethack36(6)
  .SH BUGS
  .PP
  .I recover
diff --git a/games/nethack36/files/patch-include-config.h b/games/nethack36/files/patch-include_config.h
similarity index 78%
rename from games/nethack36/files/patch-include-config.h
rename to games/nethack36/files/patch-include_config.h
index 48bbd00cd..6378c05e7 100644
--- a/games/nethack36/files/patch-include-config.h
+++ b/games/nethack36/files/patch-include_config.h
@@ -1,6 +1,6 @@
---- include/config.h.orig	2018-04-27 05:07:22.000000000 -0700
-+++ include/config.h	2019-04-26 07:32:12.113908000 -0700
-@@ -256,11 +256,11 @@
+--- include/config.h.orig	2019-12-18 20:29:40 UTC
++++ include/config.h
+@@ -263,11 +263,11 @@
  
  #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
  /* path and file name extension for compression program */
@@ -16,17 +16,17 @@
  #endif
  
  #ifndef COMPRESS
-@@ -345,7 +345,7 @@
+@@ -352,7 +352,7 @@
   * otherwise it will be the current directory.
   */
  #ifndef HACKDIR
 -#define HACKDIR "/usr/games/lib/nethackdir"
-+#define HACKDIR "%%PREFIX%%/share/nethack"
++#define HACKDIR "/usr/local/share/nethack"
  #endif
  
  /*
-@@ -520,7 +520,7 @@
-    (within the same session) */
+@@ -543,7 +543,7 @@ typedef unsigned char uchar;
+    whole thing, then type a new end for the text. */
  /* #define EDIT_GETLIN */
  
 -/* #define DUMPLOG */  /* End-of-game dump logs */
@@ -34,7 +34,7 @@
  #ifdef DUMPLOG
  
  #ifndef DUMPLOG_MSG_COUNT
-@@ -528,7 +528,7 @@
+@@ -551,7 +551,7 @@ typedef unsigned char uchar;
  #endif
  
  #ifndef DUMPLOG_FILE
@@ -42,4 +42,4 @@
 +#define DUMPLOG_FILE        "/tmp/nethack.%v.%u.%n.%D.log"
  /* DUMPLOG_FILE allows following placeholders:
     %% literal '%'
-    %v version (eg. "3.6.1-0")
+    %v version (eg. "3.6.3-0")
diff --git a/games/nethack36/files/patch-include-system.h b/games/nethack36/files/patch-include_system.h
similarity index 82%
rename from games/nethack36/files/patch-include-system.h
rename to games/nethack36/files/patch-include_system.h
index de95b659c..cd47a9729 100644
--- a/games/nethack36/files/patch-include-system.h
+++ b/games/nethack36/files/patch-include_system.h
@@ -1,6 +1,6 @@
---- include/system.h.orig	2015-12-07 08:26:01 UTC
+--- include/system.h.orig	2019-12-18 20:29:40 UTC
 +++ include/system.h
-@@ -81,7 +81,9 @@ typedef long off_t;
+@@ -82,7 +82,9 @@ typedef long off_t;
  #if !defined(__SC__) && !defined(LINUX)
  E long NDECL(random);
  #endif
diff --git a/games/nethack36/files/patch-include-unixconf.h b/games/nethack36/files/patch-include_unixconf.h
similarity index 92%
rename from games/nethack36/files/patch-include-unixconf.h
rename to games/nethack36/files/patch-include_unixconf.h
index e8ae24c5a..18805721d 100644
--- a/games/nethack36/files/patch-include-unixconf.h
+++ b/games/nethack36/files/patch-include_unixconf.h
@@ -1,6 +1,6 @@
---- include/unixconf.h.orig	2015-11-17 10:54:25 UTC
+--- include/unixconf.h.orig	2019-12-18 20:29:40 UTC
 +++ include/unixconf.h
-@@ -19,13 +19,13 @@
+@@ -20,13 +20,13 @@
   */
  
  /* define exactly one of the following four choices */
@@ -16,7 +16,7 @@
                       /* of Linux */
  /* #define HPUX */   /* Hewlett-Packard's Unix, version 6.5 or higher */
                       /* use SYSV for < v6.5 */
-@@ -297,7 +297,7 @@
+@@ -330,7 +330,7 @@
  #endif
  
  #if defined(BSD) || defined(ULTRIX)
diff --git a/games/nethack36/files/patch-lev_comp.6 b/games/nethack36/files/patch-lev_comp.6
deleted file mode 100644
index 836e1f531..000000000
--- a/games/nethack36/files/patch-lev_comp.6
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/lev_comp.6.orig	Mon Apr 12 09:28:09 2004
-+++ doc/lev_comp.6	Mon Apr 12 09:29:20 2004
-@@ -563,7 +563,7 @@
- Jean-Christophe Collet, David Cohrs.
- .SH "SEE ALSO"
- .PP
--dgn_comp(6), nethack(6)
-+dgn_comp%%HACKEXT%%(6), %%HACKNAME%%(6)
- .SH BUGS
- .PP
- Probably infinite.
diff --git a/games/nethack36/files/patch-qt_win.cpp b/games/nethack36/files/patch-qt_win.cpp
deleted file mode 100644
index 7d29f10ae..000000000
--- a/games/nethack36/files/patch-qt_win.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- win/Qt/qt_win.cpp.orig	Tue Oct 14 11:29:05 2003
-+++ win/Qt/qt_win.cpp	Tue Oct 14 11:29:52 2003
-@@ -75,6 +75,11 @@
- #undef yn
- #endif
- 
-+#ifdef Invisible
-+/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
-+#undef Invisible
-+#endif
-+
- #include "qt_win.h"
- #include <qregexp.h>
- #include <qpainter.h>
diff --git a/games/nethack36/files/patch-src-files.c b/games/nethack36/files/patch-src_files.c
similarity index 69%
rename from games/nethack36/files/patch-src-files.c
rename to games/nethack36/files/patch-src_files.c
index 09e5aab09..fbd416b34 100644
--- a/games/nethack36/files/patch-src-files.c
+++ b/games/nethack36/files/patch-src_files.c
@@ -1,6 +1,6 @@
---- src/files.c.orig	2015-12-07 08:26:01 UTC
+--- src/files.c.orig	2019-12-18 20:29:40 UTC
 +++ src/files.c
-@@ -40,6 +40,7 @@ const
+@@ -43,6 +43,7 @@ const
  
  #if defined(UNIX) && defined(QT_GRAPHICS)
  #include <sys/types.h>
diff --git a/games/nethack36/files/patch-sys-unix-Makefile.doc b/games/nethack36/files/patch-sys_unix_Makefile.doc
similarity index 71%
rename from games/nethack36/files/patch-sys-unix-Makefile.doc
rename to games/nethack36/files/patch-sys_unix_Makefile.doc
index da3cd316b..332c20237 100644
--- a/games/nethack36/files/patch-sys-unix-Makefile.doc
+++ b/games/nethack36/files/patch-sys_unix_Makefile.doc
@@ -1,12 +1,12 @@
---- ./sys/unix/Makefile.doc.orig	2015-06-12 08:32:45.000000000 +0200
-+++ ./sys/unix/Makefile.doc	2016-01-20 14:52:36.968982348 +0100
-@@ -57,17 +57,17 @@
+--- sys/unix/Makefile.doc.orig	2019-12-18 20:29:40 UTC
++++ sys/unix/Makefile.doc
+@@ -61,17 +61,17 @@ Guidebook.dvi:	Guidebook.tex
  	latex Guidebook.tex
  
  
 -GAME	= nethack
 -MANDIR	= /usr/man/man6
-+GAME	= nethack%%HACKEXT%%
++GAME	= nethack36
 +MANDIR	= ${PREFIX}/man/man
  MANEXT	= 6
  
@@ -26,7 +26,7 @@
  # manual installation for most SYSV-style systems
  # GAMEMANCREATE = cat nethack.6 | $(NHGREP) | nroff -man - >
  # LEVMANCREATE = cat lev_comp.6 | $(NHGREP) | nroff -man - >
-@@ -77,12 +77,12 @@
+@@ -81,12 +81,12 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP) >
  # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
  
  manpages:
@@ -36,12 +36,12 @@
 -	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
 -	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
 -	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
-+	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/nethack%%HACKEXT%%.$(MANEXT)
-+	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp%%HACKEXT%%.$(MANEXT)
-+	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp%%HACKEXT%%.$(MANEXT)
-+	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover%%HACKEXT%%.$(MANEXT)
-+	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb%%HACKEXT%%.$(MANEXT)
-+	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs%%HACKEXT%%.$(MANEXT)
++	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/nethack36.$(MANEXT)
++	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp36.$(MANEXT)
++	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp36.$(MANEXT)
++	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover36.$(MANEXT)
++	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb36.$(MANEXT)
++	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs36.$(MANEXT)
  
  # manual creation for distribution
  DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \
diff --git a/games/nethack36/files/patch-sys-unix-Makefile.src b/games/nethack36/files/patch-sys_unix_Makefile.src
similarity index 88%
rename from games/nethack36/files/patch-sys-unix-Makefile.src
rename to games/nethack36/files/patch-sys_unix_Makefile.src
index 1ac53670f..26f2dfbe8 100644
--- a/games/nethack36/files/patch-sys-unix-Makefile.src
+++ b/games/nethack36/files/patch-sys_unix_Makefile.src
@@ -1,6 +1,6 @@
---- sys/unix/Makefile.src.orig	2019-05-08 00:00:16.000000000 -0700
-+++ sys/unix/Makefile.src	2019-05-16 08:16:17.494864000 -0700
-@@ -165,13 +165,24 @@
+--- sys/unix/Makefile.src.orig	2019-12-18 20:29:40 UTC
++++ sys/unix/Makefile.src
+@@ -165,13 +165,24 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixr
  # directories.  The ones given below is the usual spot for linux systems.
  # The paths are for glibconfig.h and gnomesupport.h respectively.
  #
@@ -26,7 +26,7 @@
  
  # The Qt and Be window systems are written in C++, while the rest of
  # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
-@@ -273,6 +284,29 @@
+@@ -273,6 +284,29 @@ WINBEOBJ =
  # Curses - Karl Garrison, Tangles
  #WINSRC = $(WINCURSESSRC)
  #WINOBJ = $(WINCURSESOBJ)
@@ -56,7 +56,7 @@
  #
  # on some systems the termcap library is in -ltermcap or -lcurses
  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -289,6 +323,7 @@
+@@ -289,6 +323,7 @@ WINBEOBJ =
  # WINTTYLIB = -lcurses16
  # WINTTYLIB = -lncurses
  #WINTTYLIB = -ltermlib
@@ -64,7 +64,7 @@
  #
  # libraries for X11
  # If USE_XPM is defined in config.h, you will also need -lXpm here.
-@@ -296,10 +331,12 @@
+@@ -296,10 +331,12 @@ WINBEOBJ =
  # WINX11LIB = -lXaw -lXmu -lXt -lX11
  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -78,7 +78,7 @@
  #
  # libraries for Qt 4
  WINQT4LIB = `pkg-config QtGui --libs`
-@@ -311,7 +348,8 @@
+@@ -311,7 +348,8 @@ WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedi
  WINKDELIB = -lkdecore -lkdeui -lXext
  #
  # libraries for Gnome
@@ -88,7 +88,7 @@
  #
  # libraries for Gem port
  WINGEMLIB = -le_gem -lgem
-@@ -321,7 +359,7 @@
+@@ -321,7 +359,7 @@ WINBELIB = -lbe
  #
  # libraries for curses port
  # link with ncurses
@@ -97,7 +97,7 @@
  # link with pdcurses for SDL, installed in a separate directory
  #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL
  # same as above, for XCurses
-@@ -331,6 +369,18 @@
+@@ -331,6 +369,18 @@ WINCURSESLIB = -lncurses
  #
  # For Curses
  #WINLIB = $(WINCURSESLIB)
@@ -116,16 +116,16 @@
  #
  # any other strange libraries your system needs (for Sysunix only -- the more
  # specialized targets should already be right)
-@@ -363,7 +413,7 @@
+@@ -363,7 +413,7 @@ WINCURSESLIB = -lncurses
  LIBS =
  
  # make NetHack
 -GAME     = nethack
-+GAME     = nethack%%HACKEXT%%
++GAME     = nethack36
  # GAME     = nethack.prg
  
  # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
-@@ -597,13 +647,13 @@
+@@ -597,13 +647,13 @@ objects.o:
  
  # Qt 3 windowport meta-object-compiler output
  qt_kde0.moc: ../include/qt_kde0.h
diff --git a/games/nethack36/files/patch-sys-unix-Makefile.top b/games/nethack36/files/patch-sys_unix_Makefile.top
similarity index 93%
rename from games/nethack36/files/patch-sys-unix-Makefile.top
rename to games/nethack36/files/patch-sys_unix_Makefile.top
index 8f04a5064..45c54196b 100644
--- a/games/nethack36/files/patch-sys-unix-Makefile.top
+++ b/games/nethack36/files/patch-sys_unix_Makefile.top
@@ -1,11 +1,11 @@
---- sys/unix/Makefile.top.orig	2018-04-27 05:07:22.000000000 -0700
-+++ sys/unix/Makefile.top	2019-03-12 15:05:31.025765000 -0700
-@@ -20,18 +20,18 @@
+--- sys/unix/Makefile.top.orig	2019-12-18 20:29:40 UTC
++++ sys/unix/Makefile.top
+@@ -20,18 +20,18 @@ NHSROOT=.
  
  # make NetHack
  #PREFIX	 = /usr
 -GAME     = nethack
-+GAME     = nethack%%HACKEXT%%
++GAME     = nethack36
  # GAME     = nethack.prg
  #GAMEUID  = games
 -#GAMEGRP  = bin
@@ -24,13 +24,13 @@
  # VARDIRPERM = 0755
  
  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
-@@ -41,10 +41,11 @@
+@@ -41,10 +41,11 @@ DIRPERM  = 0755
  # therefore there should not be anything in HACKDIR that you want to keep
  # (if there is, you'll have to do the installation by hand or modify the
  # instructions)
 -#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
 -#VARDIR  = $(HACKDIR)
-+HACKDIR  = ${PREFIX}/share/nethack%%HACKEXT%%
++HACKDIR  = ${PREFIX}/share/nethack36
 +VARDIR  = $(HACKDIR)
 +INSTDIR = $(HACKDIR)
  # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
@@ -39,7 +39,7 @@
  
  # per discussion in Install.X11 and Install.Qt
  #VARDATND = 
-@@ -55,7 +56,7 @@
+@@ -55,7 +56,7 @@ DIRPERM  = 0755
  # for BeOS
  # VARDATND = beostiles
  # for Gnome
@@ -48,7 +48,7 @@
  
  VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
  VARDAT = $(VARDATD) $(VARDATND)
-@@ -203,52 +204,33 @@
+@@ -203,52 +204,33 @@ dofiles:
  		-e '}' 					\
  	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
  	$(MAKE) dofiles-$${target-nodlb}
@@ -110,7 +110,7 @@
  	touch $(VARDIR)/perm $(VARDIR)/record
  # and a reminder
  	@echo You may also want to install the man pages via the doc Makefile.
-@@ -260,23 +242,16 @@
+@@ -260,23 +242,16 @@ install: rootcheck $(GAME) recover $(VARDAT) dungeon s
  	true; $(PREINSTALL)
  # set up the directories
  # not all mkdirs have -p; those that don't will create a -p directory
diff --git a/games/nethack36/files/patch-sys-unix-Makefile.utl b/games/nethack36/files/patch-sys_unix_Makefile.utl
similarity index 60%
rename from games/nethack36/files/patch-sys-unix-Makefile.utl
rename to games/nethack36/files/patch-sys_unix_Makefile.utl
index 5319eee4a..652874220 100644
--- a/games/nethack36/files/patch-sys-unix-Makefile.utl
+++ b/games/nethack36/files/patch-sys_unix_Makefile.utl
@@ -1,6 +1,6 @@
---- sys/unix/Makefile.utl.orig	2015-12-07 08:26:01 UTC
+--- sys/unix/Makefile.utl.orig	2019-12-18 20:29:40 UTC
 +++ sys/unix/Makefile.utl
-@@ -92,8 +92,18 @@ NHSROOT=..
+@@ -94,8 +94,18 @@ NHSROOT=..
  # flags for debugging:
  # CFLAGS = -g -I../include
  
@@ -19,5 +19,5 @@
 +
 +LFLAGS =
  
- LIBS =
- 
+ # we specify C preprocessor flags via CFLAGS; files built with default rules
+ # might include $(CPPFLAGS) which could get a value from user's environment;
diff --git a/games/nethack36/files/patch-sys-unix-sysconf b/games/nethack36/files/patch-sys_unix_sysconf
similarity index 67%
rename from games/nethack36/files/patch-sys-unix-sysconf
rename to games/nethack36/files/patch-sys_unix_sysconf
index 979741481..798d66d26 100644
--- a/games/nethack36/files/patch-sys-unix-sysconf
+++ b/games/nethack36/files/patch-sys_unix_sysconf
@@ -1,6 +1,6 @@
---- sys/unix/sysconf.orig	2019-05-09 08:15:39.750365000 -0700
-+++ sys/unix/sysconf	2019-05-09 08:16:22.900472000 -0700
-@@ -98,7 +98,7 @@
+--- sys/unix/sysconf.orig	2019-12-18 20:29:40 UTC
++++ sys/unix/sysconf
+@@ -103,7 +103,7 @@ MAXPLAYERS=10
  #   %D current time, YYYYMMDDhhmmss format
  #   %n player name
  #   %N first character of player name
diff --git a/games/nethack36/files/patch-util-makedefs.c b/games/nethack36/files/patch-util_makedefs.c
similarity index 83%
rename from games/nethack36/files/patch-util-makedefs.c
rename to games/nethack36/files/patch-util_makedefs.c
index bce05ffa9..6e06db1e1 100644
--- a/games/nethack36/files/patch-util-makedefs.c
+++ b/games/nethack36/files/patch-util_makedefs.c
@@ -1,6 +1,6 @@
---- util/makedefs.c.orig	2019-05-08 00:00:16.000000000 -0700
-+++ util/makedefs.c	2019-05-16 08:21:09.868001000 -0700
-@@ -139,6 +139,7 @@
+--- util/makedefs.c.orig	2019-12-18 20:29:40 UTC
++++ util/makedefs.c
+@@ -139,6 +139,7 @@ static char xclear[MAX_ROW][MAX_COL];
  #define MAXFNAMELEN 600
  
  static char filename[MAXFNAMELEN];
@@ -8,7 +8,7 @@
  
  #ifdef FILE_PREFIX
  /* if defined, a first argument not starting with - is
-@@ -272,6 +273,12 @@
+@@ -279,6 +280,12 @@ char *argv[];
          return 1;
      }
  
@@ -21,7 +21,7 @@
  #ifdef FILE_PREFIX
      if (argc >= 2 && argv[1][0] != '-') {
          file_prefix = argv[1];
-@@ -967,9 +974,9 @@
+@@ -974,9 +981,9 @@ const char *fname;
      }
      Fprintf(ofp, "%s", Dont_Edit_Data);
  
@@ -33,7 +33,7 @@
  
      while ((line = fgetline(ifp)) != 0) {
          if (line[0] != '#' && line[0] != '\n')
-@@ -979,7 +986,7 @@
+@@ -986,7 +993,7 @@ const char *fname;
      Fclose(ifp);
      Fclose(ofp);
  
@@ -42,7 +42,7 @@
      return;
  }
  
-@@ -2230,9 +2237,9 @@
+@@ -2272,9 +2279,9 @@ do_dungeon()
      }
      Fprintf(ofp, "%s", Dont_Edit_Data);
  
@@ -54,7 +54,7 @@
  
      while ((line = fgetline(ifp)) != 0) {
          SpinCursor(3);
-@@ -2247,7 +2254,7 @@
+@@ -2289,7 +2296,7 @@ do_dungeon()
      Fclose(ifp);
      Fclose(ofp);
  
diff --git a/games/nethack36/files/patch-win_Qt_qt__win.cpp b/games/nethack36/files/patch-win_Qt_qt__win.cpp
new file mode 100644
index 000000000..545e59fa5
--- /dev/null
+++ b/games/nethack36/files/patch-win_Qt_qt__win.cpp
@@ -0,0 +1,23 @@
+--- win/Qt/qt_win.cpp.orig	2019-12-18 20:29:40 UTC
++++ win/Qt/qt_win.cpp
+@@ -74,6 +74,11 @@ extern "C" {
+ 
+ }
+ 
++#ifdef Invisible
++/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
++#undef Invisible
++#endif
++
+ #include "qt_win.h"
+ #include <qregexp.h>
+ #include <qpainter.h>
+@@ -105,7 +110,7 @@ extern "C" {
+ #ifdef Q_WS_MACX
+ #  include <sys/malloc.h>
+ #else
+-#  include <malloc.h>
++#  include <stdlib.h>
+ #endif
+ 
+ #ifdef _WS_X11_
diff --git a/games/nethack36/files/patch-win-tty-termcap.c b/games/nethack36/files/patch-win_tty_termcap.c
similarity index 79%
rename from games/nethack36/files/patch-win-tty-termcap.c
rename to games/nethack36/files/patch-win_tty_termcap.c
index e35b0c439..2fc061bfd 100644
--- a/games/nethack36/files/patch-win-tty-termcap.c
+++ b/games/nethack36/files/patch-win_tty_termcap.c
@@ -1,6 +1,6 @@
---- win/tty/termcap.c.orig	2015-11-11 10:05:22 UTC
+--- win/tty/termcap.c.orig	2019-12-18 20:29:40 UTC
 +++ win/tty/termcap.c
-@@ -206,10 +206,6 @@ int *wid, *hgt;
+@@ -199,10 +199,6 @@ int *wid, *hgt;
          error("Terminal must backspace.");
  #else
          if (!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */