diff --git a/games/nethack36/Makefile b/games/nethack36/Makefile
index a1d781cd938d..ab5f1d018710 100644
--- a/games/nethack36/Makefile
+++ b/games/nethack36/Makefile
@@ -1,107 +1,108 @@
 PORTNAME=	nethack36
 PORTVERSION=	3.6.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://nethack.org/download/${PORTVERSION}/
 DISTNAME=	${TRUEPORTNAME}-${PORTVERSION:S/.//g}-src
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dungeon explorin', slashin', hackin' game
 WWW=		https://www.nethack.org/
 
 LICENSE=	nethack
 LICENSE_NAME=	NETHACK GENERAL PUBLIC LICENSE
 LICENSE_FILE=	${WRKSRC}/dat/license
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		alias compiler:c11 gmake ncurses tar:tgz
 
 WRKSRC=		${WRKDIR}/NetHack-${PORTVERSION}
 
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
 		HACKEXT="${HACKEXT}"
 TRUEPORTNAME=	nethack
 
 # Configure these variables as you want them to be.
 HACKEXT?=	36
 HACKNAME?=	${TRUEPORTNAME}${HACKEXT}
 HACKDIR?=	share/${HACKNAME}
 HACKLINK=	${TRUEPORTNAME}
 
 DATADIR=	${PREFIX}/${HACKDIR}
 DOCSDIR=	${PREFIX}/share/doc/${HACKNAME}
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 .if !defined(PKGNAMESUFFIX)
 USES+=		xorg
 USE_XORG=	xaw xpm xmu xext xt x11 sm ice
 CFLAGS+=	-DX11_GRAPHICS -DUSE_TILES
 GRAPHICS=	X11_GRAPHICS
 .else
 .if ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
 .endif
 .endif
 CFLAGS+=	-DNOMAIL -DCURSES_GRAPHICS
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else
 PLIST_SUB+=	HACKLINK="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
 	@${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp
 .for f in sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top
 	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
 		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
 		-e 's|%%HACKEXT%%|${HACKEXT}|g' \
 		${WRKSRC}/${f}
 .endfor
 .for f in dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
 		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
 		-e 's|%%HACKEXT%%|${HACKEXT}|g' \
 		${WRKSRC}/doc/${f}
 .endfor
 .if defined(WITHOUT_SHELL)
 	@${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h
 .endif
 .if defined(WITH_MAIL)
 	@${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h
 .endif
 
 do-configure:
 	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
 pre-install:
 	@${CAT} ${FILESDIR}/pkg-deinstall.in | ${SED} \
 		-e 's|%%HACKDIR%%|${HACKDIR}|g' > ${PKGDEINSTALL}
 
 post-install:
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 	@${LN} -s -f ${PREFIX}/bin/${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK}
 .endif
 	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages
 	@${MKDIR} ${STAGEDIR}${DATADIR}/save
 	@${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf
 	# Make sysconf a sample to prevent it being removed if altered
 	@${CP} ${STAGEDIR}/${DATADIR}/sysconf ${STAGEDIR}/${DATADIR}/sysconf.sample
 	# Make "sample" files from records to prevent them being removed
 	# if they have been altered
 	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/logfile.sample
 	@${CP} ${STAGEDIR}/${DATADIR}/record ${STAGEDIR}/${DATADIR}/record.sample
 	@${CP} ${STAGEDIR}/${DATADIR}/xlogfile ${STAGEDIR}/${DATADIR}/xlogfile.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/nethack36/files/patch-sys-unix-Makefile.doc b/games/nethack36/files/patch-sys-unix-Makefile.doc
index da3cd316b4de..73acd2c7101f 100644
--- a/games/nethack36/files/patch-sys-unix-Makefile.doc
+++ b/games/nethack36/files/patch-sys-unix-Makefile.doc
@@ -1,47 +1,47 @@
 --- ./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 @@
  	latex Guidebook.tex
  
  
 -GAME	= nethack
 -MANDIR	= /usr/man/man6
 +GAME	= nethack%%HACKEXT%%
-+MANDIR	= ${PREFIX}/man/man
++MANDIR	= ${PREFIX}/share/man/man
  MANEXT	= 6
  
  # manual installation for most BSD-style systems
 -GAMEMANCREATE = cat nethack.6 | $(NHGREP) >
 -LEVMANCREATE = cat lev_comp.6 | $(NHGREP) >
 -DGNMANCREATE = cat dgn_comp.6 | $(NHGREP) >
 -RCVRMANCREATE = cat recover.6 | $(NHGREP) >
 -DLBMANCREATE = cat dlb.6 | $(NHGREP) >
 -MDMANCREATE = cat makedefs.6 | $(NHGREP) >
 +GAMEMANCREATE = cat nethack.6 | $(NHGREP) > nethack.6.out ; ${BSD_INSTALL_MAN} nethack.6.out
 +LEVMANCREATE = cat lev_comp.6 | $(NHGREP) > lev_comp.6.out ; ${BSD_INSTALL_MAN} lev_comp.6.out
 +DGNMANCREATE = cat dgn_comp.6 | $(NHGREP) > dgn_comp.6.out ; ${BSD_INSTALL_MAN} dgn_comp.6.out
 +RCVRMANCREATE = cat recover.6 | $(NHGREP) > recover.6.out ; ${BSD_INSTALL_MAN} recover.6.out
 +DLBMANCREATE = cat dlb.6 | $(NHGREP) > dlb.6.out ; ${BSD_INSTALL_MAN} dlb.6.out
 +MDMANCREATE = cat makedefs.6 | $(NHGREP) > makedefs.6.out ; ${BSD_INSTALL_MAN} makedefs.6.out
  # 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 @@
  # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
  
  manpages:
 -	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
 -	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
 -	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
 -	-$(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)
  
  # manual creation for distribution
  DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \
diff --git a/games/nethack36/pkg-plist b/games/nethack36/pkg-plist
index f1a6b0f25a82..cca121126f42 100644
--- a/games/nethack36/pkg-plist
+++ b/games/nethack36/pkg-plist
@@ -1,173 +1,173 @@
 %%HACKLINK%%bin/nethack
 @mode 555
 bin/%%HACKNAME%%
 @owner games
 @group games
 @mode 02755
 %%DATADIR%%/%%HACKNAME%%
 @mode
 %%DATADIR%%/Arc-fila.lev
 %%DATADIR%%/Arc-filb.lev
 %%DATADIR%%/Arc-goal.lev
 %%DATADIR%%/Arc-loca.lev
 %%DATADIR%%/Arc-strt.lev
 %%DATADIR%%/Bar-fila.lev
 %%DATADIR%%/Bar-filb.lev
 %%DATADIR%%/Bar-goal.lev
 %%DATADIR%%/Bar-loca.lev
 %%DATADIR%%/Bar-strt.lev
 %%DATADIR%%/Cav-fila.lev
 %%DATADIR%%/Cav-filb.lev
 %%DATADIR%%/Cav-goal.lev
 %%DATADIR%%/Cav-loca.lev
 %%DATADIR%%/Cav-strt.lev
 %%DATADIR%%/Hea-fila.lev
 %%DATADIR%%/Hea-filb.lev
 %%DATADIR%%/Hea-goal.lev
 %%DATADIR%%/Hea-loca.lev
 %%DATADIR%%/Hea-strt.lev
 %%DATADIR%%/Kni-fila.lev
 %%DATADIR%%/Kni-filb.lev
 %%DATADIR%%/Kni-goal.lev
 %%DATADIR%%/Kni-loca.lev
 %%DATADIR%%/Kni-strt.lev
 %%DATADIR%%/Mon-fila.lev
 %%DATADIR%%/Mon-filb.lev
 %%DATADIR%%/Mon-goal.lev
 %%DATADIR%%/Mon-loca.lev
 %%DATADIR%%/Mon-strt.lev
 %%DATADIR%%/Pri-fila.lev
 %%DATADIR%%/Pri-filb.lev
 %%DATADIR%%/Pri-goal.lev
 %%DATADIR%%/Pri-loca.lev
 %%DATADIR%%/Pri-strt.lev
 %%DATADIR%%/Ran-fila.lev
 %%DATADIR%%/Ran-filb.lev
 %%DATADIR%%/Ran-goal.lev
 %%DATADIR%%/Ran-loca.lev
 %%DATADIR%%/Ran-strt.lev
 %%DATADIR%%/Rog-fila.lev
 %%DATADIR%%/Rog-filb.lev
 %%DATADIR%%/Rog-goal.lev
 %%DATADIR%%/Rog-loca.lev
 %%DATADIR%%/Rog-strt.lev
 %%DATADIR%%/Sam-fila.lev
 %%DATADIR%%/Sam-filb.lev
 %%DATADIR%%/Sam-goal.lev
 %%DATADIR%%/Sam-loca.lev
 %%DATADIR%%/Sam-strt.lev
 %%DATADIR%%/Tou-fila.lev
 %%DATADIR%%/Tou-filb.lev
 %%DATADIR%%/Tou-goal.lev
 %%DATADIR%%/Tou-loca.lev
 %%DATADIR%%/Tou-strt.lev
 %%DATADIR%%/Val-fila.lev
 %%DATADIR%%/Val-filb.lev
 %%DATADIR%%/Val-goal.lev
 %%DATADIR%%/Val-loca.lev
 %%DATADIR%%/Val-strt.lev
 %%DATADIR%%/Wiz-fila.lev
 %%DATADIR%%/Wiz-filb.lev
 %%DATADIR%%/Wiz-goal.lev
 %%DATADIR%%/Wiz-loca.lev
 %%DATADIR%%/Wiz-strt.lev
 %%DATADIR%%/air.lev
 %%DATADIR%%/asmodeus.lev
 %%DATADIR%%/astral.lev
 %%DATADIR%%/baalz.lev
 %%DATADIR%%/bigrm-1.lev
 %%DATADIR%%/bigrm-2.lev
 %%DATADIR%%/bigrm-3.lev
 %%DATADIR%%/bigrm-4.lev
 %%DATADIR%%/bigrm-5.lev
 %%DATADIR%%/bigrm-6.lev
 %%DATADIR%%/bigrm-7.lev
 %%DATADIR%%/bigrm-8.lev
 %%DATADIR%%/bigrm-9.lev
 %%DATADIR%%/bigrm-10.lev
 %%DATADIR%%/bogusmon
 %%DATADIR%%/castle.lev
 %%DATADIR%%/cmdhelp
 %%DATADIR%%/data
 %%DATADIR%%/dungeon
 %%DATADIR%%/earth.lev
 %%DATADIR%%/engrave
 %%DATADIR%%/epitaph
 %%DATADIR%%/fakewiz1.lev
 %%DATADIR%%/fakewiz2.lev
 %%DATADIR%%/fire.lev
 %%DATADIR%%/help
 %%DATADIR%%/hh
 %%DATADIR%%/history
 %%DATADIR%%/juiblex.lev
 %%DATADIR%%/keyhelp
 %%DATADIR%%/knox.lev
 %%DATADIR%%/license
 @sample(games,games,664) %%DATADIR%%/logfile.sample
 %%DATADIR%%/mapbg.xpm
 %%DATADIR%%/medusa-1.lev
 %%DATADIR%%/medusa-2.lev
 %%DATADIR%%/medusa-3.lev
 %%DATADIR%%/medusa-4.lev
 %%DATADIR%%/minefill.lev
 %%DATADIR%%/minend-1.lev
 %%DATADIR%%/minend-2.lev
 %%DATADIR%%/minend-3.lev
 %%DATADIR%%/minetn-1.lev
 %%DATADIR%%/minetn-2.lev
 %%DATADIR%%/minetn-3.lev
 %%DATADIR%%/minetn-4.lev
 %%DATADIR%%/minetn-5.lev
 %%DATADIR%%/minetn-6.lev
 %%DATADIR%%/minetn-7.lev
 %%DATADIR%%/opthelp
 %%DATADIR%%/options
 %%DATADIR%%/oracle.lev
 %%DATADIR%%/oracles
 %%DATADIR%%/orcus.lev
 @mode 664
 %%DATADIR%%/perm
 @mode
 %%DATADIR%%/pet_mark.xbm
 %%DATADIR%%/pilemark.xbm
 %%DATADIR%%/quest.dat
 @sample(games,games,664) %%DATADIR%%/record.sample
 @mode 02755
 %%DATADIR%%/recover
 @mode
 %%DATADIR%%/rip.xpm
 %%DATADIR%%/rumors
 %%DATADIR%%/sanctum.lev
 %%DATADIR%%/soko1-1.lev
 %%DATADIR%%/soko1-2.lev
 %%DATADIR%%/soko2-1.lev
 %%DATADIR%%/soko2-2.lev
 %%DATADIR%%/soko3-1.lev
 %%DATADIR%%/soko3-2.lev
 %%DATADIR%%/soko4-1.lev
 %%DATADIR%%/soko4-2.lev
 %%DATADIR%%/symbols
 @sample(games,games,) %%DATADIR%%/sysconf.sample
 %%DATADIR%%/tower1.lev
 %%DATADIR%%/tower2.lev
 %%DATADIR%%/tower3.lev
 %%DATADIR%%/tribute
 %%DATADIR%%/valley.lev
 %%DATADIR%%/water.lev
 %%DATADIR%%/wizard1.lev
 %%DATADIR%%/wizard2.lev
 %%DATADIR%%/wizard3.lev
 %%DATADIR%%/wizhelp
 %%DATADIR%%/x11tiles
 @sample(games,games,664) %%DATADIR%%/xlogfile.sample
 @owner
 @group
-man/man6/dgn_comp%%HACKEXT%%.6.gz
-man/man6/dlb%%HACKEXT%%.6.gz
-man/man6/lev_comp%%HACKEXT%%.6.gz
-man/man6/makedefs%%HACKEXT%%.6.gz
-man/man6/%%HACKNAME%%.6.gz
-man/man6/recover%%HACKEXT%%.6.gz
+share/man/man6/dgn_comp%%HACKEXT%%.6.gz
+share/man/man6/dlb%%HACKEXT%%.6.gz
+share/man/man6/lev_comp%%HACKEXT%%.6.gz
+share/man/man6/makedefs%%HACKEXT%%.6.gz
+share/man/man6/%%HACKNAME%%.6.gz
+share/man/man6/recover%%HACKEXT%%.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
 @dir(games,games,0775) %%DATADIR%%/save
 @dir(games,games,0775) %%DATADIR%%