diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index 04af985b7..c50e2ef9b 100644
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -1,5 +1,5 @@
 # NetHack 3.7	Makefile.GCC	$NHDT-Date: 1596498268 2020/08/03 23:44:28 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.53 $
-#	Copyright (c) NetHack PC Development Team 1996-2019.
+#	Copyright (c) NetHack PC Development Team 1996-2022.
 #	PC NetHack 3.7 Makefile for djgpp V2
 #
 #	Gnu gcc compiler for msdos (djgpp)
@@ -35,8 +35,8 @@ GAMEDIR =../binary
 #    of your PDCurses C files which must already be resident on 
 #    your machine.
 #
-ADD_CURSES=Y
-PDCURSES_TOP=../../pdcurses
+#ADD_CURSES=Y
+#PDCURSES_TOP=../../pdcurses
 
 #---------------------------------------------------------------
 ifeq "$(LUA_VERSION)" "5.3.5"
@@ -870,7 +870,7 @@ $(DAT)/nhdat:	$(U)dlb_main.exe $(DAT)/data $(DAT)/rumors \
 	@$(subst /,\,cd $(DAT))
 	@$(subst /,\,copy $(MSYS)/msdoshlp.txt .)
 	@$(LS) data oracles options rumors help hh >dlb.lst
-	@$(LS) cmdhelp history opthelp wizhelp license msdoshlp.txt >>dlb.lst
+	@$(LS) cmdhelp history opthelp optmenu wizhelp license msdoshlp.txt >>dlb.lst
 	@$(LS) bogusmon engrave epitaph tribute >>dlb.lst
 	$(LS) $(subst /,\,*.lua) >>dlb.lst
 	@$(subst /,\,$(U)dlb_main cvIf dlb.lst nhdat)
diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
index a769da734..882576412 100644
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -1070,6 +1070,7 @@
 				"$(NH_DAT_DIR)/history",
 				"$(NH_DAT_DIR)/keyhelp",
 				"$(NH_DAT_DIR)/opthelp",
+				"$(NH_DAT_DIR)/optmenu",
 				"$(NH_DAT_DIR)/options",
 				"$(NH_DAT_DIR)/oracles",
 				"$(NH_DAT_DIR)/rumors",
@@ -1209,7 +1210,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"${NH_DAT_DIR}\"\n\"${NH_UTIL_DIR}\"/dlb cf nhdat help hh cmdhelp keyhelp history opthelp wizhelp dungeon.lua tribute asmodeus.lua baalz.lua bigrm-*.lua castle.lua fakewiz?.lua juiblex.lua knox.lua medusa-?.lua minend-?.lua minefill.lua minetn-?.lua oracle.lua orcus.lua sanctum.lua soko?-?.lua tower?.lua valley.lua wizard?.lua nhcore.lua nhlib.lua themerms.lua astral.lua air.lua earth.lua fire.lua water.lua ???-goal.lua ???-fil?.lua ???-loca.lua ???-strt.lua bogusmon data engrave epitaph oracles options quest.lua rumors\n";
+			shellScript = "cd \"${NH_DAT_DIR}\"\n\"${NH_UTIL_DIR}\"/dlb cf nhdat help hh cmdhelp keyhelp history opthelp optmenu wizhelp dungeon.lua tribute asmodeus.lua baalz.lua bigrm-*.lua castle.lua fakewiz?.lua juiblex.lua knox.lua medusa-?.lua minend-?.lua minefill.lua minetn-?.lua oracle.lua orcus.lua sanctum.lua soko?-?.lua tower?.lua valley.lua wizard?.lua nhcore.lua nhlib.lua themerms.lua astral.lua air.lua earth.lua fire.lua water.lua ???-goal.lua ???-fil?.lua ???-loca.lua ???-strt.lua bogusmon data engrave epitaph oracles options quest.lua rumors\n";
 		};
 		3192867021A39F6A00325BEB /* Install */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/sys/windows/Makefile.gcc b/sys/windows/Makefile.gcc
index add81a7e3..e9d541643 100644
--- a/sys/windows/Makefile.gcc
+++ b/sys/windows/Makefile.gcc
@@ -1092,7 +1092,7 @@ $(DAT)/porthelp: $(MSWSYS)/porthelp
 
 nhdat$(NHV):  $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \
 	$(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp $(DAT)/keyhelp \
-	$(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp \
+	$(DAT)/history $(DAT)/opthelp $(DAT)/optmenu $(DAT)/wizhelp \
 	$(DAT)/porthelp $(DAT)/license $(DAT)/engrave \
 	$(DAT)/epitaph $(DAT)/bogusmon $(DAT)/tribute $(O)sp_lev.tag
 	$(subst /,\,echo data >$(DAT)/dlb.lst)
@@ -1108,6 +1108,7 @@ nhdat$(NHV):  $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \
 	$(subst /,\,echo keyhelp >>$(DAT)/dlb.lst)
 	$(subst /,\,echo history >>$(DAT)/dlb.lst)
 	$(subst /,\,echo opthelp >>$(DAT)/dlb.lst)
+	$(subst /,\,echo optmenu >>$(DAT)/dlb.lst)
 	$(subst /,\,echo wizhelp >>$(DAT)/dlb.lst)
 	$(subst /,\,echo license >>$(DAT)/dlb.lst)
 	$(subst /,\,echo engrave >>$(DAT)/dlb.lst)
diff --git a/sys/windows/Makefile.msc b/sys/windows/Makefile.msc
index 6b49a4714..09d50854f 100644
--- a/sys/windows/Makefile.msc
+++ b/sys/windows/Makefile.msc
@@ -1040,6 +1040,7 @@ $(O)install.tag: 	$(DAT)\data	$(DAT)\rumors	$(DAT)\oracles \
 	copy $(DAT)\hh $(GAMDEDIR)
 	copy $(DAT)\history $(GAMEDIR)
 	copy $(DAT)\license $(GAMEDIR)
+	copy $(DAT)\optmenu $(GAMEDIR)
 	copy $(DAT)\oracles $(GAMEDIR)
 	copy $(DAT)\rumors $(GAMEDIR)
 	copy $(DAT)\symbols $(GAMEDIR)
@@ -1320,7 +1321,7 @@ $(DAT)\porthelp: $(MSWSYS)\porthelp
 
 nhdat$(NHV):	$(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(DAT)\quest.lua \
 	$(DAT)\rumors $(DAT)\help $(DAT)\hh $(DAT)\cmdhelp $(DAT)\keyhelp \
-	$(DAT)\history $(DAT)\opthelp $(DAT)\wizhelp $(DAT)\porthelp \
+	$(DAT)\history $(DAT)\opthelp $(DAT)\optmenu $(DAT)\wizhelp $(DAT)\porthelp \
 	$(DAT)\license $(DAT)\engrave $(DAT)\epitaph $(DAT)\bogusmon $(DAT)\tribute $(O)sp_lev.tag
 	cd $(DAT)
 	echo data >dlb.lst
@@ -1336,6 +1337,7 @@ nhdat$(NHV):	$(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(DAT)\quest
 	echo keyhelp >>dlb.lst
 	echo history >>dlb.lst
 	echo opthelp >>dlb.lst
+	echo optmenu >>dlb.lst
 	echo wizhelp >>dlb.lst
 	echo license >>dlb.lst
 	echo engrave >>dlb.lst
diff --git a/sys/windows/vs/files.props b/sys/windows/vs/files.props
index 2c8e74f4d..79478268b 100644
--- a/sys/windows/vs/files.props
+++ b/sys/windows/vs/files.props
@@ -183,6 +183,7 @@
     <DlbList Include = "$(DatDir)keyhelp"/>
     <DlbList Include = "$(DatDir)history"/>
     <DlbList Include = "$(DatDir)opthelp"/>
+    <DlbList Include = "$(DatDir)optmenu"/>
     <DlbList Include = "$(DatDir)wizhelp"/>
     <DlbList Include = "$(DatDir)license"/>
     <DlbList Include = "$(DatDir)*.lua"/>