diff --git a/sys/unix/README-hints b/sys/unix/README-hints
index a666bd9e8..283d1cf29 100644
--- a/sys/unix/README-hints
+++ b/sys/unix/README-hints
@@ -5,7 +5,7 @@ The sys/unix/hints/include subfolder contains Makefile content that
 is included in the distributed Makefiles.
 
 
-[.370 hints]
+[.500 hints]
 
 
 There are two .500 series hints files provided with NetHack:
@@ -16,7 +16,7 @@ Those will also pull in content from sys/unix/hints/include/*.370,
 that is shared between the linux.500 and macOS.500 hints files.
 
 
-[.370 make build options]
+[.500 make build options]
 
 
 Here are some options that can be specified on the make command
diff --git a/sys/unix/hints/include/cross-post.500 b/sys/unix/hints/include/cross-post.500
index d42661b2b..f4f236e2f 100644
--- a/sys/unix/hints/include/cross-post.500
+++ b/sys/unix/hints/include/cross-post.500
@@ -90,8 +90,8 @@ else
 	  fi; )
 endif
 	-touch $(TARGETPFX)pkg/RECORD
-	cd $(TARGETPFX)pkg ; zip -9 ../NH500DOS.ZIP * ; cd ../../..
-	@echo msdos package zip file $(TARGETPFX)NH500DOS.ZIP
+	cd $(TARGETPFX)pkg ; zip -9 ../NH$(NHV)DOS.ZIP * ; cd ../../..
+	@echo msdos package zip file $(TARGETPFX)NH$(NHV)DOS.ZIP
 
 $(LUABIN):
 	( cd .. && make luabin && cd src)
@@ -105,14 +105,14 @@ deploy-to-dosbox:
 endif
 .PHONY: deploytodosbox
 
-deploytodosbox: $(TARGETPFX)NH500DOS.ZIP $(dosboxnhfolder) $(dosboxnhsrc) \
+deploytodosbox: $(TARGETPFX)NH$(NHV)DOS.ZIP $(dosboxnhfolder) $(dosboxnhsrc) \
 			$(dosboxnhsrc)/src $(dosboxnhsrc)/include \
 			$(dosboxnhsrc)/sys/msdos $(dosboxnhsrc)/sys/share \
 			$(dosboxnhsrc)/win/share $(dosboxnhsrc)/win/curses \
 			$(dosboxnhsrc)/win/tty $(dosboxnhsrc)/util \
 			$(dosboxnhfolder)/NETHACK.EXE
 	@echo DOS NetHack deployed to dosbox at $(dosboxnhfolder)
-$(TARGETPFX)NH500DOS.ZIP: dospkg
+$(TARGETPFX)NH$(NHV)DOS.ZIP: dospkg
 $(dosboxnhfolder):
 	mkdir -p $@
 $(dosboxnhsrc): $(dosboxnhfolder)
@@ -144,8 +144,8 @@ $(dosboxnhsrc)/util: $(dosboxnhsrc)
 	mkdir -p $@
 	cp --preserve=timestamps $(FLDR)util/*.c $(dosboxnhsrc)/util
 	cp --preserve=timestamps $(FLDR)util/*.h $(dosboxnhsrc)/util
-$(dosboxnhfolder)/NETHACK.EXE: $(TARGETPFX)NH500DOS.ZIP
-	unzip -o $(TARGETPFX)NH500DOS.ZIP -d $(dosboxnhfolder)
+$(dosboxnhfolder)/NETHACK.EXE: $(TARGETPFX)NH$(NHV)DOS.ZIP
+	unzip -o $(TARGETPFX)NH$(NHV)DOS.ZIP -d $(dosboxnhfolder)
 	find $(dosboxnhfolder) -type f -name "$(dosboxconfigfile)" \
 		| xargs sed -i 's/#OPTIONS=video:autodetect/OPTIONS=video:autodetect/g'
 endif  # dosbox
@@ -225,8 +225,8 @@ mipspkg: dodata $(GAMEBIN) $(TARGETPFX)recover
 	cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
 	cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt
 	-touch $(TARGETPFX)pkg/record
-	cd $(TARGETPFX)pkg ; zip -9 ../nh500mips.zip * ; cd ../../..
-	@echo MIPS package zip file $(TARGETPFX)nh500mips.zip
+	cd $(TARGETPFX)pkg ; zip -9 ../nh$(NHV)mips.zip * ; cd ../../..
+	@echo MIPS package zip file $(TARGETPFX)nh$(NHV)mips.zip
 endif  # CROSS_TO_MIPS
 
 
@@ -332,8 +332,8 @@ amigapkg: $(AMITILES) ../util/uudecode
 	-( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/HackWB.uu && \
 		../../../util/uudecode ../../../sys/amiga/HackWB.uu )
 	touch $(TARGETPFX)pkg/record
-	( cd $(TARGETPFX)pkg && zip -9r ../NH500AMI.ZIP * )
-	@echo amiga package zip file $(TARGETPFX)NH500AMI.ZIP
+	( cd $(TARGETPFX)pkg && zip -9r ../NH$(NHV)AMI.ZIP * )
+	@echo amiga package zip file $(TARGETPFX)NH$(NHV)AMI.ZIP
 endif  # CROSS_TO_AMIGA
 
 ifdef CROSS_SHARED
diff --git a/sys/unix/hints/include/cross-pre2.500 b/sys/unix/hints/include/cross-pre2.500
index 40fc51da1..d7f853721 100644
--- a/sys/unix/hints/include/cross-pre2.500
+++ b/sys/unix/hints/include/cross-pre2.500
@@ -146,7 +146,7 @@ ifdef DOSBOX
 dosbox=$(DOSBOX)
 endif
 ifdef dosbox
-dosboxgameid=NH500
+dosboxgameid=NH$(NHV)
 dosboxtop=$(dosbox)
 dosboxnhfolder=$(dosboxtop)/$(dosboxgameid)
 dosboxnhsrc=$(dosboxnhfolder)/NHSRC
diff --git a/sys/unix/hints/include/multiw-1.500 b/sys/unix/hints/include/multiw-1.500
index df89d95a5..96f9173e6 100644
--- a/sys/unix/hints/include/multiw-1.500
+++ b/sys/unix/hints/include/multiw-1.500
@@ -19,5 +19,9 @@
 #WANT_DEFAULT=Qt
 #WANT_DEFAULT=X11
 
+# Based on the NetHack version 5.0.0
+# Used to build some filenames subsequently in other include files
+NHV=500
+
 #end of multiw-1.500
 #------------------------------------------------------------------------------
diff --git a/sys/windows/GNUmakefile b/sys/windows/GNUmakefile
index e6bc43ec0..cfbcead9e 100644
--- a/sys/windows/GNUmakefile
+++ b/sys/windows/GNUmakefile
@@ -1388,9 +1388,8 @@ TARGET_CPU = x86
 endif
 endif
 
-NHV=370
 PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \
-	NetHackW.exe opthelp nhdat370 record symbols sysconf.template $(notdir $(LUADLL))
+	NetHackW.exe opthelp nhdat$(NHV) record symbols sysconf.template $(notdir $(LUADLL))
 
 FILESTOZIP = $(addprefix $(GAMEDIR)/, $(PKGFILES))
 MAINZIP = $(PkgDir)/nethack-$(NHV)-win-$(TARGET_CPU)-msys2.zip
diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake
index f2bfe1e19..080e530be 100644
--- a/sys/windows/Makefile.nmake
+++ b/sys/windows/Makefile.nmake
@@ -2785,11 +2785,11 @@ $(SndWavDir)sa2_xplevelup.wav: $(SndWavDir)sa2_xplevelup.uu $(U)uudecode.exe
 #===============================================================================
 
 PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \
-	 NetHackW.exe opthelp nhdat500 record symbols \
+	 NetHackW.exe opthelp nhdat$(NHV) record symbols \
 	 sysconf.template $(SFCTOOLBASENAM)
 FILESTOZIP = $(BinDir)nethackrc.template $(BinDir)Guidebook.txt $(BinDir)license \
 	$(BinDir)NetHack.exe $(BinDir)NetHack.txt $(BinDir)NetHackW.exe \
-	$(BinDir)opthelp $(BinDir)nhdat500 $(BinDir)record \
+	$(BinDir)opthelp $(BinDir)nhdat$(NHV) $(BinDir)record \
 	$(BinDir)symbols $(BinDir)sysconf.template $(SFCTOOLPKG)
 
 DBGSYMS = NetHack.PDB NetHackW.PDB $(SFCTOOLPDBNAM)