diff --git a/sys/windows/vs/package/package.nmake b/sys/windows/vs/package/package.nmake
index 0c01ca074..20e9ac7d3 100644
--- a/sys/windows/vs/package/package.nmake
+++ b/sys/windows/vs/package/package.nmake
@@ -26,22 +26,24 @@ PlatformFileName=$(lowercase $(PSN))
 
 # Directories we might have to collect things from
 #
-INCL    = $(ROOTDIR)include     # NetHack include files
-DAT     = $(ROOTDIR)dat         # NetHack data files
-DOC     = $(ROOTDIR)doc         # NetHack documentation files
-UTIL    = $(ROOTDIR)util        # Utility source
-SRC     = $(ROOTDIR)src         # Main source
-SSYS    = $(ROOTDIR)sys\share   # Shared system files
-MSWSYS  = $(ROOTDIR)sys\windows # MS windows specific files
-TTY     = $(ROOTDIR)win\tty     # window port files (tty)
-MSWIN   = $(ROOTDIR)win\win32   # window port files (win32)
-WCURSES = $(ROOTDIR)win\curses  # window port files (curses)
-WSHR    = $(ROOTDIR)win\share   # Tile support files
-QT      = $(ROOTDIR)win\Qt      # QT support files
-X11     = $(ROOTDIR)win\X11     # X11 support files
-LIBDIR  = $(ROOTDIR)lib         # libraries and external bits
-SUBMDIR = $(ROOTDIR)submodules  # NetHack git submodules
-SndWavDir = $(ROOTDIR)sound\wav # sound files that get integrated
+#INCL    = $(ROOTDIR)include     # NetHack include files
+#DAT     = $(ROOTDIR)dat         # NetHack data files
+#DOC     = $(ROOTDIR)doc         # NetHack documentation files
+#UTIL    = $(ROOTDIR)util        # Utility source
+#SRC     = $(ROOTDIR)src         # Main source
+#SSYS    = $(ROOTDIR)sys\share   # Shared system files
+#MSWSYS  = $(ROOTDIR)sys\windows # MS windows specific files
+#TTY     = $(ROOTDIR)win\tty     # window port files (tty)
+#MSWIN   = $(ROOTDIR)win\win32   # window port files (win32)
+#WCURSES = $(ROOTDIR)win\curses  # window port files (curses)
+#WSHR    = $(ROOTDIR)win\share   # Tile support files
+#QT      = $(ROOTDIR)win\Qt      # QT support files
+#X11     = $(ROOTDIR)win\X11     # X11 support files
+#SndWavDir = $(ROOTDIR)sound\wav # sound files that get integrated
+
+# libraries and external bits
+LIBDIR  = $(ROOTDIR)lib\
+# Documentation and text files
 DocDir  = $(ROOTDIR)doc\
 
 # Directories we might place collected things
@@ -90,11 +92,11 @@ $(DBGSYMZIP): $(PDBTOZIP)
 
 $(VSBINDIR)\license: $(BinDir)license
 	copy /Y $(BinDir)license $@
-$(VSBINDIR)\Guidebook.txt: $(BinDir)Guidebook.txt
+$(VSBINDIR)\Guidebook.txt: $(DocDir)Guidebook.txt
 	copy /Y $(DocDir)Guidebook.txt $@
 $(VSBINDIR)\NetHack.exe: $(BinDir)NetHack.exe
 	copy /Y $(BinDir)NetHack.exe $@
-$(VSBINDIR)\NetHack.txt: $(BinDir)NetHack.txt
+$(VSBINDIR)\NetHack.txt: $(DocDir)NetHack.txt
 	copy /Y $(DocDir)NetHack.txt $@
 $(VSBINDIR)\NetHackW.exe: $(BinDir)NetHackW.exe
 	copy /Y $(BinDir)NetHackW.exe $@
@@ -127,10 +129,10 @@ vsbindir:
 	@if not exist $(VSBINDIR)\*.* mkdir $(VSBINDIR)
 
 clean:
-#	@if exist $(LIBDIR)\$(PDCDIST) rmdir /Q $(LIBDIR)\$(PDCDIST) /s
-#	@if exist $(LIBDIR)\lua-$(LUA_VERSION) rmdir /Q $(LIBDIR)\lua-$(LUA_VERSION) /s
+#	@if exist $(LIBDIR)$(PDCDIST) rmdir /Q $(LIBDIR)$(PDCDIST) /s
+#	@if exist $(LIBDIR)lua-$(LUA_VERSION) rmdir /Q $(LIBDIR)lua-$(LUA_VERSION) /s
 #	@if exist ..\..\..\..\include\nhlua.h del /Q ..\..\..\..\include\nhlua.h
 
 rebuild:
-#	@if exist $(LIBDIR)\$(PDCDIST) echo nothing to do for lib\$(PDCDIST)
-#	@if exist $(LIBDIR)\lua-$(LUA_VERSION) echo nothing to do for lib\lua-$(LUA_VERSION)
+#	@if exist $(LIBDIR)$(PDCDIST) echo nothing to do for lib\$(PDCDIST)
+#	@if exist $(LIBDIR)lua-$(LUA_VERSION) echo nothing to do for lib\lua-$(LUA_VERSION)