diff --git a/INSTALL b/INSTALL
index b32f0923c..cbad6e83f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Documentation for getting and building netCDF
 *********************************************
 
 This document is for getting and building the netCDF C library and
-utilities, version 4.2.  Other libraries that depend on the netCDF C
+utilities, version 4.2.1.  Other libraries that depend on the netCDF C
 library, such as the Fortran and C++ libraries, are available as
 separate distributions that can be built and installed after the C
 library is successfully installed.  The netCDF-Java library is also a
@@ -63,7 +63,7 @@ libraries. (And, optionally, the szlib library). Versions required are
 at least HDF5 1.8.8, zlib 1.2.5, and curl 7.18.0 or later.
 (Optionally, if building with szlib, get szip 2.0 or later.)
 
-HDF5 1.8.8 and zlib 1.2.5 packages are available from the netCDF-4 ftp
+HDF5 1.8.9 and zlib 1.2.7 packages are available from the netCDF-4 ftp
 site:
 
   ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4
diff --git a/man4/install.doc b/man4/install.doc
index 7ceb29086..b4825ee48 100644
--- a/man4/install.doc
+++ b/man4/install.doc
@@ -2,7 +2,7 @@
 Documentation for getting and building netCDF
 
 This document is for getting and building the netCDF C library and
-utilities, version 4.2.  Other libraries that depend on the netCDF C
+utilities, version 4.2.1.  Other libraries that depend on the netCDF C
 library, such as the Fortran and C++ libraries, are available as
 separate distributions that can be built and installed after the C
 library is successfully installed.  The netCDF-Java library is also a
@@ -56,7 +56,7 @@ libraries. (And, optionally, the szlib library). Versions required are
 at least HDF5 1.8.8, zlib 1.2.5, and curl 7.18.0 or later.
 (Optionally, if building with szlib, get szip 2.0 or later.)
 
-HDF5 1.8.8 and zlib 1.2.5 packages are available from the <a
+HDF5 1.8.9 and zlib 1.2.7 packages are available from the <a
 href="ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4">netCDF-4 ftp
 site</a>. If you wish to use the remote data client code, then you
 will also need libcurl, which can be obtained from the <a
diff --git a/nc-config.in b/nc-config.in
index 89a90d737..580f79377 100644
--- a/nc-config.in
+++ b/nc-config.in
@@ -21,6 +21,7 @@ has_hdf5="@HAS_HDF5@"
 has_szlib="@HAS_SZLIB@"
 version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
 
+has_f90="no"
 if type -p nf-config > /dev/null 2>&1; then
   fc=`nf-config --fc`
   fflags=`nf-config --fflags`
@@ -28,12 +29,20 @@ if type -p nf-config > /dev/null 2>&1; then
   has_f90=`nf-config --has-f90`
 fi
 
-if type -p ncxx-config > /dev/null 2>&1; then
+has_cxx="no"
+has_cxx4="no"
+if type -p ncxx4-config > /dev/null 2>&1; then
+  cxx4=`ncxx4-config --cxx`
+#  cxxflags=`ncxx4-config --cxxflags`
+#  cxxlibs=`ncxx4-config --cxxlibs`
+  has_cxx4="yes"
+elif type -p ncxx-config > /dev/null 2>&1; then
   cxx=`ncxx-config --cxx`
-  has_cxx=`ncxx-config --has_cxx`
+#  cxxflags=`ncxx-config --cxxflags`
+#  cxxlibs=`ncxx-config --cxxlibs`
+  has_cxx="yes"
 fi
 
-
 usage()
 {
     cat <<EOF
@@ -58,10 +67,18 @@ Available values for OPTION include:
   --version     Library version
 
 EOF
-if type -p ncxx-config > /dev/null 2>&1; then
+# When supported by ncxx4-config and ncxx-config, add
+#  --cxxflags    flags needed to compile a netCDF-4 C++ program
+#  --cxxlibs     libraries needed to link a netCDF-4 C++ program
+if type -p ncxx4-config > /dev/null 2>&1; then
+    cat <<EOF
+  --cxx4         C++ compiler for netCDF-4 C++ library
+  --has-c++4     whether netCDF-4 C++ API is installed
+EOF
+elif type -p ncxx-config > /dev/null 2>&1; then
     cat <<EOF
   --cxx         C++ compiler
-  --has-c++     whether C++ API is enabled in this build
+  --has-c++     whether C++ API is installed
 
 EOF
 fi
@@ -70,7 +87,7 @@ if type -p nf-config > /dev/null 2>&1; then
   --fc          Fortran compiler
   --fflags      flags needed to compile a Fortran program
   --flibs       libraries needed to link a Fortran program
-  --has-f90     whether Fortran 90 API is enabled in this build
+  --has-f90     whether Fortran 90 API is installed
 
 EOF
 fi
@@ -86,8 +103,12 @@ all()
         echo "  --cflags    -> $cflags"
         echo "  --libs      -> $libs"
         echo
-        echo "  --cxx       -> $cxx"
         echo "  --has-c++   -> $has_cxx"
+        echo "  --cxx       -> $cxx"
+#	echo "  --cxxflags  -> $cxxflags"
+#	echo "  --cxxlibs   -> $cxxlibs"
+        echo "  --has-c++4  -> $has_cxx4"
+        echo "  --cxx4      -> $cxx4"
         echo
         echo "  --fc        -> $fc"
         echo "  --fflags    -> $fflags"
@@ -183,14 +204,30 @@ while test $# -gt 0; do
 	echo $version
 	;;
 
+    --has-c++)
+       	echo $has_cxx
+       	;;
+
     --cxx)
 	echo $cxx
 	;;
 
-    --has-c++)
-       	echo $has_cxx
+    --has-c++4)
+       	echo $has_cxx4
        	;;
 
+    --cxx4)
+	echo $cxx4
+	;;
+
+#    --cxxflags)
+#	echo $cxxflags
+#	;;
+#
+#    --cxxlibs)
+#	echo $cxxlibs
+#	;;
+
     --fc)
 	echo $fc
 	;;