diff --git a/vms/build.com b/vms/build.com
index f65a45be11..eb621de098 100644
--- a/vms/build.com
+++ b/vms/build.com
@@ -14,10 +14,10 @@ $!# access to either file, you may request a copy from help@hdfgroup.org.
 $!#
 $!
 $!
-$! This file builds C, Frtran, C++ HDF5 librraies and runs the tests
+$! This file builds C, Fortran, C++ HDF5 libraries and runs the tests
 $! Specify location of the top HDF5 source directory
 $
-$ hdf5top == "sys$sysusers:[pourmale.hdf5]"
+$ hdf5top == "sys$sysusers:[pourmal.hdf5]"
 $ len = F$LENGTH(hdf5top)
 $ tmp = F$EXTRACT(0, len-1, hdf5top)
 $ hdf5vms     = tmp + ".VMS]"
diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index e8c9f986a8..cde20e2438 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -15,9 +15,8 @@ $!#
 $!
 $! Make HDF5 C++ examples
 $!
-$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
-$
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS/include=zlib_dir"
 $ ccc := cxx 'cxxopt /include=([-.-.include])
 $!
 $!
diff --git a/vms/c++/src/make.com b/vms/c++/src/make.com
index 82d93b25ac..37525bcbf9 100644
--- a/vms/c++/src/make.com
+++ b/vms/c++/src/make.com
@@ -16,6 +16,10 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C++ library
 $!
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
 $! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
 $ ccc := cxx 'cxxopt /include=([-.-.src])
 $!
diff --git a/vms/c++/test/make.com b/vms/c++/test/make.com
index ab4dc03779..47d9370599 100644
--- a/vms/c++/test/make.com
+++ b/vms/c++/test/make.com
@@ -16,7 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C++ library tests
 $!
-$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
 $
 $ ccc := cxx 'cxxopt /include=([-.-.src], [-.-.test], [-.src])
 $! 
diff --git a/vms/examples/make.com b/vms/examples/make.com
index 94223d6704..74c4d9653b 100644
--- a/vms/examples/make.com
+++ b/vms/examples/make.com
@@ -15,10 +15,12 @@ $!#
 $! Makefile for VMS systems.
 $!
 $! Make HDF5 C examples
+$! Build examples after you install libraries and examples.
+$! install.com installs binaries under the HDF5 directory in the top
+$! source directory.
 $!
-$ ccopt = "/float=ieee_float/nowarnings/define=H5_VMS"
-$
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$ ccopt = "/float=ieee_float/nowarnings/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.include])
 $ type sys$input
  	Compiling  C examples
diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com
index 9f1819856c..591ba63395 100644
--- a/vms/fortran/examples/make.com
+++ b/vms/fortran/examples/make.com
@@ -17,7 +17,7 @@ $!
 $! Make HDF5 Fortran examples
 $!
 $ fcopt = "/float=ieee_float/define=H5_VMS"
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
 $ fff := fortran 'fcopt /module=[-.-.include]
 $
 $ type sys$input
diff --git a/vms/fortran/src/make.com b/vms/fortran/src/make.com
index 980246e47d..5ad89ff148 100644
--- a/vms/fortran/src/make.com
+++ b/vms/fortran/src/make.com
@@ -16,7 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 Fortran library
 $!
-$! define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$! The thre two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$!
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
 $! ccopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
 $! fcopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
 $ ccc := cc 'ccopt /include=[-.-.src]
@@ -54,13 +58,12 @@ $ ffiles= "H5_ff.f90, H5Aff.f90, H5Dff.f90, H5Eff.f90,"+-
           "H5Lff.f90, H5Off.f90,"+-
           "H5Fff.f90, H5Gff.f90, H5Iff.f90, H5Pff.f90, H5Rff.f90, H5Sff.f90,"+-
           "H5Tff.f90, H5Zff.f90, H5_DBLE_InterfaceInclude.f90, HDF5.f90"
-$ fobj="H5fortran_flags, H5f90global, "+-
+$ fobj="H5f90global, "+-
        "H5fortran_types, H5_ff, H5Aff, H5Dff, H5Eff,"+-
        "H5Fff, H5Gff, H5Iff, H5Lff, H5Off, H5Pff, H5Rff, H5Sff,"+-
        "H5Tff, H5Zff, H5_DBLE_InterfaceInclude, HDF5"
 $!
 $ ccc 'cobj 
-$ fff H5fortran_flags.f90
 $ fff H5fortran_types.f90
 $ fff H5f90global.f90
 $ 
diff --git a/vms/install.com b/vms/install.com
index 21ebbbddca..f1f9304bbe 100644
--- a/vms/install.com
+++ b/vms/install.com
@@ -33,6 +33,8 @@ $ hdf5tools_h5ls        = hdf5top_dir + "TOOLS.H5LS]"
 $ hdf5tools_h5repack    = hdf5top_dir + "TOOLS.H5REPACK]"
 $ hdf5tools_h5jam       = hdf5top_dir + "TOOLS.H5JAM]"
 $ hdf5tools_h5import    = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5tools_h5stat      = hdf5top_dir + "TOOLS.H5STAT]"
+$ hdf5tools_h5misc      = hdf5top_dir + "TOOLS.H5MISC]"
 $ hdf5fortran_examples  = hdf5top_dir + "FORTRAN.EXAMPLES]"
 $ hdf5fortran_src       = hdf5top_dir + "FORTRAN.SRC]"
 $ hdf5cxx_src           = hdf5top_dir + "C__.SRC]"
@@ -137,6 +139,13 @@ $!
 $ set def 'hdf5tools_h5import'
 $ copy h5import.exe 'hdf5install_bin'
 $!
+$ set def 'hdf5tools_h5stat'
+$ copy h5stat.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5misc'
+$ copy h5debug.exe 'hdf5install_bin'
+$ copy h5mkgrp.exe 'hdf5install_bin'
+$!
 $ write sys$output "Installing examples"
 $ set def 'hdf5examples'
 $ copy *.c 'hdf5install_examples_c'
diff --git a/vms/make.com b/vms/make.com
index ba4c78495b..f51e6ab746 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -38,8 +38,8 @@ $ copy [.tools.misc]make.com    [-.tools.misc]
 $!
 $! Define location of ZLIB library. If you do not have it on your system, download
 $! source code from http://www.zlib.net/, build and install on your system
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
-$! define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3-ieee]
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3-ieee]
 $!
 $! Set up compilation flags here
 $! Do not remove define=H5_VMS and standard=strict_ansi qualifiers.
diff --git a/vms/src/make.com b/vms/src/make.com
index 146b461dd9..30755bd269 100644
--- a/vms/src/make.com
+++ b/vms/src/make.com
@@ -16,7 +16,12 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 library
 $!
-$ ccopt = "/float=ieee_float/define=H5_VMS"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build 
+$! the distribution. Make sure that location of the zlib library is correct.
+$!
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt 
 $ ccc h5detect.c
 $ link h5detect
diff --git a/vms/test/make.com b/vms/test/make.com
index 22ab5b83b7..3f51c65fcd 100644
--- a/vms/test/make.com
+++ b/vms/test/make.com
@@ -16,7 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 library tests
 $!
-$ ccopt = "/float=ieee_float/define=H5_VMS"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $!
 $ ccc := cc 'ccopt /include=([-.src])
 $ type sys$input
diff --git a/vms/tools/h5copy/make.com b/vms/tools/h5copy/make.com
index 384cb6ec97..1a95f589b9 100644
--- a/vms/tools/h5copy/make.com
+++ b/vms/tools/h5copy/make.com
@@ -16,7 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5copy tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index d4de5dcebe..c1e00784f0 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -16,8 +16,11 @@ $! Makefile for VAX/VMX systems.
 $!
 $! Make h5diff tool 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $!
 $ cobj= "h5diff_main, h5diff_common, h5diffgentest"
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 70ae63a95e..612b524b83 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -16,14 +16,14 @@ $! Makefile for VMS systems.
 $!
 $! Make h5dump tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
-$ 
-$
 $ cobj= "h5dump.c, h5dumpgentest.c "
-
-$                               
 $ ccc 'cobj 
 $ type sys$input
        Creating h5dumpgentest ...
@@ -31,8 +31,6 @@ $ link     h5dumpgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
  	Finished  h5dumpgentest
-
-$
 $ type sys$input
        Creating h5dump ...
 $ link     h5dump, -
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index b0bffd0ac9..6afbd70b1b 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5import tool 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
        Creating  h5import ...
@@ -26,7 +29,6 @@ $ cobj= "h5import, h5importtest "
 
 $!                               
 $ ccc 'cobj 
-$
 $ link     h5import,-
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
diff --git a/vms/tools/h5jam/make.com b/vms/tools/h5jam/make.com
index 533837009c..d57b5e9a7c 100644
--- a/vms/tools/h5jam/make.com
+++ b/vms/tools/h5jam/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating h5jam
@@ -26,7 +29,6 @@ $ cobj= "h5jam, h5unjam, tellub, getub, h5jamgentest"
 
 $!                               
 $ ccc 'cobj 
-$
 $ type sys$input
        Creating tellub
 $ link     tellub -
diff --git a/vms/tools/h5ls/check.com b/vms/tools/h5ls/check.com
deleted file mode 100644
index b44dedcded..0000000000
--- a/vms/tools/h5ls/check.com
+++ /dev/null
@@ -1,70 +0,0 @@
-$!#
-$!# Copyright by The HDF Group.
-$!# Copyright by the Board of Trustees of the University of Illinois.
-$!# All rights reserved.
-$!#
-$!# This file is part of HDF5.  The full HDF5 copyright notice, including
-$!# terms governing use, modification, and redistribution, is contained in
-$!# the files COPYING and Copyright.html.  COPYING can be found at the root
-$!# of the source code distribution tree; Copyright.html can be found at the
-$!# root level of an installed copy of the electronic HDF5 document set and
-$!# is linked from the top-level documents page.  It can also be found at
-$!# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-$!# access to either file, you may request a copy from help@hdfgroup.org.
-$!#
-$!
-$! h5ls testing script
-$!
-$ define sys$output h5ls.out
-$ define sys$error  h5ls.err
-$ h5ls :== $sys$sysusers:[pourmale.hdf5.tools.h5ls]h5ls.exe
-
-$ h5ls -w80 -h
-$ h5ls -w80 -help
-$ h5ls -w80 -?
-
-$! test simple command
-$ h5ls -w80 tall.h5
-$ h5ls -w80 -r -d tall.h5
-$ h5ls -w80 tgroup.h5
-
-$! test for displaying groups
-$ h5ls -w80 -r -g tgroup.h5
-
-$! test for displaying simple space datasets
-$ h5ls -w80 -r -d tdset.h5
-
-$! test for displaying soft links
-$ h5ls -w80 -r tslink.h5
-
-$! tests for hard links
-$ h5ls -w80 thlink.h5
-
-$! tests for compound data types
-$ h5ls -w80 -r -d tcompound.h5
-
-$!test for the nested compound type
-$ h5ls -w80 -r -d tnestedcomp.h5
-
-$! test for loop detection
-$ h5ls -w80 -r -d tloop.h5
-
-$! test for string 
-$ h5ls -w80 -r -d tstr.h5
-
-$! test test file created from lib SAF team
-$ h5ls -w80 -r -d tsaf.h5
-
-$! test for variable length data types
-$ h5ls -w80 -r -d tvldtypes1.h5
-
-$! test for array data types
-$ h5ls -w80 -r -d tarray1.h5
-
-$! test for empty data
-$ h5ls -w80 -d tempty.h5
-
-$! test for all dataset types written to attributes
-$! enable -S for avoiding printing NATIVE types
-$ h5ls -w80 -v -S tattr2.h5
-
diff --git a/vms/tools/h5ls/make.com b/vms/tools/h5ls/make.com
index 7de34e92f8..51d57c6009 100644
--- a/vms/tools/h5ls/make.com
+++ b/vms/tools/h5ls/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating h5ls
@@ -26,7 +29,6 @@ $ cobj= "h5ls.c "
 
 $!                               
 $ ccc 'cobj 
-$
 $ type sys$input
        Creating h5ls
 $ link     h5ls, -
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index 259533764e..0de0e2b61f 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5repack tool 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
        Creating h5repack ...
@@ -37,7 +40,6 @@ $ link/exe=h5repack.exe -
 $ type sys$input
        Finished  h5repack
 
-$
 $ type sys$input
        Creating h5repacktst ...
 $ link/exe=h5repacktst.exe -
@@ -47,7 +49,6 @@ $ link/exe=h5repacktst.exe -
            h5repack_verify, -
            [-.lib]libh5tools.olb/lib,[-.-.test]libh5test.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$
 $ type sys$input
        Finished  h5repacktst
 $!
diff --git a/vms/tools/h5stat/make.com b/vms/tools/h5stat/make.com
index 51f0f65f0e..a822aaa018 100644
--- a/vms/tools/h5stat/make.com
+++ b/vms/tools/h5stat/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5stat tool 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
     	Creating h5stat
diff --git a/vms/tools/misc/make.com b/vms/tools/misc/make.com
index 0f10de8635..4c8e223dfa 100644
--- a/vms/tools/misc/make.com
+++ b/vms/tools/misc/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make miscellaneous tools 
 $!
-$ ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
     	Creating h5debug
@@ -46,6 +49,6 @@ $ type sys$input
 	Created  h5mkgrp
 $!
 $ type sys$input
-       Done with tests compilation
+       Done with misc tools compilation
 $!
 $ exit