diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10
index 4c2485cfc..79b2a783f 100644
--- a/sys/unix/hints/macosx10.10
+++ b/sys/unix/hints/macosx10.10
@@ -1,14 +1,13 @@
 #
-# NetHack 3.5  macosx10.10 $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
-# NetHack 3.5  macosx10.10 $Date: 2012/01/18 22:32:24 $  $Revision: 1.4 $
-# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
+# NetHack 3.6  macosx10.11 $NHDT-Date: 1445622451 2015/10/23 17:47:31 $  $NHDT-Branch: master $:$NHDT-Revision: 1.0 $
+# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.10.3.  If this doesn't work for some other version
-# of Mac OS X, make a new file for that OS, don't change this one.  And
-# let us know about it.
+# This is for Mac OS X 10.10 or later.  If this doesn't work for some other
+# version of Mac OS X, make a new file for that OS, don't change this one.
+# And let us know about it.
 # Useful info: http://www.opensource.apple.com/darwinsource/index.html
 
 # This hints file can build several different types of installations.
@@ -16,7 +15,7 @@
 
 # 1. Which window system(s) should be included in this binary?
 WANT_WIN_TTY=1
-WANT_WIN_X11=1
+#WANT_WIN_X11=1
 #WANT_WIN_QT=1
 
 # 1a. What is the default window system?
@@ -99,7 +98,7 @@ WINOBJ += $(WINX11OBJ)
 WINLIB += $(WINX11LIB)
 LFLAGS=-L/usr/X11R6/lib
 VARDATND = x11tiles NetHack.ad pet_mark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
 CFLAGS += -DX11_GRAPHICS -I/usr/X11R6/include
 endif	# WANT_WIN_X11
 
@@ -137,8 +136,6 @@ ifeq ($(GAMEUID),root)
 PREFIX:=/Library/NetHack
 SHELLDIR=/usr/local/bin
 HACKDIR=$(PREFIX)/nethackdir
-INSTDIR=$(HACKDIR)
-VARDIR=$(HACKDIR)
 CHOWN=chown
 CHGRP=chgrp
 # We run sgid so the game has access to both HACKDIR and user preferences.
@@ -147,8 +144,6 @@ else	# ! root
 PREFIX:=/Users/$(GAMEUID)
 SHELLDIR=$(PREFIX)/bin
 HACKDIR=$(PREFIX)/nethackdir
-INSTDIR=$(HACKDIR)
-VARDIR=$(HACKDIR)
 CHOWN=/usr/bin/true
 CHGRP=/usr/bin/true
 GAMEPERM = 0500
@@ -159,15 +154,13 @@ ROOTCHECK= [[ `id -u` == 0 ]] || ( echo "Must run install with sudo."; exit 1)
 # XXX it's nice we don't write over sysconf, but we've already erased it
 # make sure we have group GAMEUID and group GAMEGRP
 PREINSTALL= . sys/unix/hints/macosx.sh user2 $(GAMEUID); . sys/unix/hints/macosx.sh group2 $(GAMEGRP); mkdir $(SHELLDIR); chown $(GAMEUID) $(SHELLDIR)
-POSTINSTALL+= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
+POSTINSTALL+= cp -n sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
 else ifdef WANT_SOURCE_INSTALL
 PREFIX=$(abspath $(NHSROOT))
 # suppress nethack.sh
 #SHELLDIR=
 HACKDIR=$(PREFIX)/playground
-INSTDIR=$(HACKDIR)
-VARDIR=$(HACKDIR)
 CHOWN=/usr/bin/true
 CHGRP=/usr/bin/true
 GAMEPERM = 0700
@@ -180,8 +173,6 @@ else	# !WANT_SOURCE_INSTALL
 PREFIX:=$(wildcard ~)
 SHELLDIR=$(PREFIX)/bin
 HACKDIR=$(PREFIX)/nethackdir
-INSTDIR=$(HACKDIR)
-VARDIR=$(HACKDIR)
 CHOWN=/usr/bin/true
 CHGRP=/usr/bin/true
 GAMEPERM = 0700
@@ -191,7 +182,7 @@ ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
 PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
 endif	# WANT_WIN_X11
-POSTINSTALL+= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
+POSTINSTALL+= cp -n sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
 endif	# !WANT_SOURCE_INSTALL
 
@@ -216,12 +207,12 @@ ifdef MAKEFILE_TOP
 
 ifdef WANT_WIN_TTY
 DEVUTIL=/Developer/Applications/Utilities
-PKGR=$(DEVUTIL)/PackageMaker.app/Contents/MacOS/PackageMaker
+PKGR=productbuild
 SVS=$(shell $(NHSROOT)/util/makedefs --svs)
 SVSDOT=$(shell $(NHSROOT)/util/makedefs --svs .)
 
-PKGROOT_UG	= PKGROOT/usr/games
-PKGROOT_UGLN	= PKGROOT/usr/games/lib/nethackdir
+PKGROOT_UG	= PKGROOT/usr/local/games
+PKGROOT_UGLN	= PKGROOT/usr/local/games/lib/nethackdir
 build_tty_pkg:
 ifneq (,$(WANT_WIN_X11)$(WANT_WIN_QT))
 	-echo build_tty_pkg only works for a tty-only build
@@ -254,7 +245,7 @@ else
 	osacompile -o PKGROOT/Applications/NetHackGuidebook.app \
 		 win/macosx/NetHackGuidebook.applescript
 
-	$(PKGR) --root PKGROOT --info Info.plist -e RESOURCES -v -o NetHack-$(SVS)-mac-Term.pkg
+	$(PKGR) --root PKGROOT --product Info.plist --resources RESOURCES NetHack-$(SVS)-mac-Term.pkg
 	hdiutil create -verbose -srcfolder NetHack-$(SVS)-mac-Term.pkg NetHack-$(SVS)-mac-Term.dmg
 
 build_package_root: