diff --git a/sys/vms/.gitattributes b/sys/vms/.gitattributes
index 31e18fe84..21561faf1 100644
--- a/sys/vms/.gitattributes
+++ b/sys/vms/.gitattributes
@@ -1 +1,2 @@
 Makefile.* NHSUBST
+*.com NHSUBST
diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src
index 8274024c7..18772beb2 100644
--- a/sys/vms/Makefile.src
+++ b/sys/vms/Makefile.src
@@ -1,5 +1,5 @@
 #	NetHack Makefile (VMS) - for building nethack itself.
-#	NetHack 3.6	Makefile.src	$NHDT-Date: 1447314365 2015/11/12 07:46:05 $	$NHDT-Branch: master $:$NHDT-Revision: 1.27 $
+#	NetHack 3.6	Makefile.src	$NHDT-Date: 1465133388 2016/06/05 13:29:48 $	$NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.28 $
 
 #  Copy this file to [.src]Makefile. and then edit it as needed.
 #  The default configuration is for building with DEC C (aka Compaq C).
@@ -97,7 +97,7 @@ RANDOBJ = random.obj
 # Other things that have to be reconfigured are in vmsconf.h,
 # and config.h
 
-VERSION  = 3.5.0
+VERSION  = 3.6.1
 
 MAKEDEFS = $(UTL)makedefs.exe;
 
diff --git a/sys/vms/install.com b/sys/vms/install.com
old mode 100644
new mode 100755
index 21298a9bb..ac2f4e1db
--- a/sys/vms/install.com
+++ b/sys/vms/install.com
@@ -1,6 +1,6 @@
 $ ! vms/install.com -- set up nethack 'playground'
 $ !
-$ ! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$ ! $NHDT-Date: 1465133391 2016/06/05 13:29:51 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.9 $
 $ !
 $ ! Use vmsbuild.com to create nethack.exe, makedefs, and lev_comp *first*.
 $ !
@@ -24,7 +24,8 @@ $
 $	! note: all filespecs contain some punctuation,
 $	!	to avoid inadvertent logical name interaction
 $	play_files = "PERM.,RECORD.,LOGFILE.,PANICLOG."
-$	help_files = "HELP.,HH.,CMDHELP.,WIZHELP.,OPTHELP.,HISTORY.,LICENSE."
+$	help_files = "HELP.,HH.,CMDHELP.,KEYHELP.,WIZHELP.,OPTHELP.," -
+		   + "HISTORY.,LICENSE."
 $	data_files = "DATA.,RUMORS.,ORACLES.,OPTIONS.,QUEST.DAT,TRIBUTE."
 $	sysconf_file = "[.sys.vms]sysconf"
 $	guidebook  = "[.doc]Guidebook.txt"
diff --git a/sys/vms/nethack.com b/sys/vms/nethack.com
index d73899ac3..7afcf5d0b 100755
--- a/sys/vms/nethack.com
+++ b/sys/vms/nethack.com
@@ -1,7 +1,7 @@
 $! NetHack.Com -- sample command procedure for invoking NetHack  9-JAN-1993
 $ v = 'f$verify(0)'
 $!
-$! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$! $NHDT-Date: 1465133392 2016/06/05 13:29:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.4 $
 $!
 $!    Possible command line arguments include
 $!	"-uConan-B"	!play a barbarian named Conan
diff --git a/sys/vms/spec_lev.com b/sys/vms/spec_lev.com
index 0da5537ad..f12e2f8d6 100755
--- a/sys/vms/spec_lev.com
+++ b/sys/vms/spec_lev.com
@@ -1,6 +1,6 @@
 $ ! sys/vms/spec_lev.com -- preprocess nethack's special level compiler code
 $ !
-$ ! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$ ! $NHDT-Date: 1465133393 2016/06/05 13:29:53 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.4 $
 $ !
 $ ! This operation needs to be performed prior to executing vmsbuild.com.
 $ ! Process the scanning and parsing code for NetHack's special level
diff --git a/sys/vms/vmsbuild.com b/sys/vms/vmsbuild.com
index 1ae200e0a..069af041b 100755
--- a/sys/vms/vmsbuild.com
+++ b/sys/vms/vmsbuild.com
@@ -1,6 +1,6 @@
 $ ! vms/vmsbuild.com -- compile and link NetHack 3.6.*			[pr]
-$	version_number = "3.5.0"
-$ ! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$	version_number = "3.6.1"
+$ ! $NHDT-Date: 1465133393 2016/06/05 13:29:53 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.15 $
 $ !
 $ ! usage:
 $ !   $ set default [.src]	!or [-.-.src] if starting from [.sys.vms]