diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index ab7e28f73dd..e72d371f2ec 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -32,6 +32,9 @@ fi
 # Figure out GNU C compiler flags
 . $srcdir/config/gnu-flags
 
+# Figure out NVIDIA C Compiler flags
+.  $srcdir/config/nvidia-flags
+
 # Figure out PGI C compiler flags
 . $srcdir/config/pgi-flags
 
@@ -113,6 +116,9 @@ fi
 # Figure out GNU FC compiler flags
 . $srcdir/config/gnu-fflags
 
+# Figure out NVIDIA FC compiler flags
+. $srcdir/config/nvidia-fflags
+
 # Figure out PGI FC compiler flags
 . $srcdir/config/pgi-fflags
 
@@ -205,6 +211,9 @@ fi
 # Figure out GNU CXX compiler flags
 . $srcdir/config/gnu-cxxflags
 
+# Figure out NVIDIA CXX compiler flags
+. $srcdir/config/nvidia-cxxflags
+
 # Figure out PGI CXX compiler flags
 . $srcdir/config/pgi-cxxflags
 
@@ -245,6 +254,10 @@ case $CC in
             grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
         ;;
 
+    *nvc*)
+        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'nvc'`
+        ;;
+
     *)
         echo "No match to get cc_version_info for $CC"
         ;;
@@ -296,6 +309,7 @@ case $FC in
     *pgf90*)
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
         ;;
+
     *nagfor*|*nagftn*)
         RM='rm -f'
         tmpfile=/tmp/cmpver.$$
@@ -310,6 +324,10 @@ case $FC in
         echo "compiler '$FC' is $fc_version_info"
 	;;
 
+    *nvfortran*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'nvfortran'`
+        ;;
+
      *)
         echo "No match to get fc_version_info for $FC"
         ;;
@@ -320,6 +338,9 @@ fi
 # check if the compiler_version_info is already set
 if test -z "$cxx_version_info"; then
 case $CXX in
+    *nvc++*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'nvc++'`
+        ;;
     *pgc++*)
         cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgc++'`
         ;;
diff --git a/config/nvidia-cxxflags b/config/nvidia-cxxflags
new file mode 100644
index 00000000000..6becd26887a
--- /dev/null
+++ b/config/nvidia-cxxflags
@@ -0,0 +1,101 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# 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 COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# NVIDIA nvc++ compiler or a derivative.  It is careful not to do anything
+# if the compiler is not NVIDIA; otherwise `cxx_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for NVIDIA nvc++
+# unless a compiler version is already known
+#
+#   cxx_vendor:    The compiler name: nvc++
+#   cxx_version:   Version number: 5.0-2, 5.2-2
+#
+if test X = "X$cxx_flags_set"; then
+    cxx_version="`$CXX $CXXFLAGS -V 2>&1 |grep '^nvc++ '`"
+    if test X != "X$cxx_version"; then
+        cxx_vendor=`echo $cxx_version |sed 's/\([a-z]*++\).*/\1/'`
+        cxx_version=`echo $cxx_version |sed 's/nvc++ \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$CXX' is NVIDIA $cxx_vendor-$cxx_version"
+
+        # Some version numbers
+        # NVIDIA version numbers are of the form: "major.minor-patch"
+        cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+        cxx_vers_minor=`echo $cxx_version | cut -f2 -d. | cut -f1 -d-`
+        cxx_vers_patch=`echo $cxx_version | cut -f2 -d. | cut -f2 -d-`
+        test -n "$cxx_vers_major" || cxx_vers_major=0
+        test -n "$cxx_vers_minor" || cxx_vers_minor=0
+        test -n "$cxx_vers_patch" || cxx_vers_patch=0
+        cxx_vers_all=`expr $cxx_vers_major '*' 1000000 + $cxx_vers_minor '*' 1000 + $cxx_vers_patch`
+    fi
+fi
+
+# Common PGI flags for various situations
+if test "X-nvc++" = "X-$cxx_vendor"; then
+
+    ###########
+    # General #
+    ###########
+
+    # Default to C++11 standard
+    H5_CXXFLAGS="$H5_CXXFLAGS -std=c++11 -Minform=warn"
+
+    ##############
+    # Production #
+    ##############
+
+    PROD_CXXFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly in configure
+    # -g is handled by the symbols flags
+    DEBUG_CXXFLAGS="-Mbounds"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CXXFLAGS="-s"
+    SYMBOLS_CXXFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CXXFLAGS="-Mprof=func,line"
+    # Use this for profiling with gprof
+    #PROFILE_CXXFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CXXFLAGS="-O4"
+    DEBUG_OPT_CXXFLAGS="-gopt -O2"
+    NO_OPT_CXXFLAGS="-O0"
+
+    #################
+    # Flags are set #
+    #################
+    cxx_flags_set=yes
+fi
+
+# Clear cxx info if no flags set
+if test "X-$cxx_flags_set" = "X-"; then
+    cxx_vendor=
+    cxx_version=
+fi
diff --git a/config/nvidia-fflags b/config/nvidia-fflags
new file mode 100644
index 00000000000..324a54c52ff
--- /dev/null
+++ b/config/nvidia-fflags
@@ -0,0 +1,139 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# 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 COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# NVIDIA nvfortran compiler or a derivative.  It is careful not to do anything
+# if the compiler is not NVIDIA; otherwise `f9x_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for NVIDIA nvfortran
+# unless a compiler version is already known
+#
+#   f9x_vendor:    The compiler name: nvfortran
+#   f9x_version:   Version number: 
+#
+if test X = "X$f9x_flags_set"; then
+    f9x_version="`$FC $FCFLAGS -V 2>&1 |grep '^nvfortran '`"
+    if test X != "X$f9x_version"; then
+        is_mpi="`$FC $FCFLAGS -help 2>&1 |grep 'link MPI'`"
+        f9x_vendor=`echo $f9x_version |sed 's/\([a-z0-9]*\).*/\1/'`
+        f9x_version=`echo $f9x_version |sed 's/nvfortran \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$FC' is NVIDIA $f9x_vendor-$f9x_version"
+
+        # Some version numbers
+        # NVIDIA version numbers are of the form: "major.minor-patch"
+        f9x_vers_major=`echo $f9x_version | cut -f1 -d.`
+        f9x_vers_minor=`echo $f9x_version | cut -f2 -d. | cut -f1 -d-`
+        f9x_vers_patch=`echo $f9x_version | cut -f2 -d. | cut -f2 -d-`
+        test -n "$f9x_vers_major" || f9x_vers_major=0
+        test -n "$f9x_vers_minor" || f9x_vers_minor=0
+        test -n "$f9x_vers_patch" || f9x_vers_patch=0
+        f9x_vers_all=`expr $f9x_vers_major '*' 1000000 + $f9x_vers_minor '*' 1000 + $f9x_vers_patch`
+    fi
+fi
+
+# Common NVIDIA flags for various situations
+if test "X-nvfortran" = "X-$f9x_vendor"; then
+
+    ###############################
+    # Architecture-specific flags #
+    ###############################
+
+    arch=
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "$host_os-$host_cpu" in
+    #    *-i686)
+    #        arch="-march=i686"
+    #        ;;
+    #esac
+
+    # Host-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "`hostname`" in
+    #    sleipnir.ncsa.uiuc.edu)
+    #        arch="$arch -pipe"
+    #        ;;
+    #esac
+
+    ##############
+    # Production #
+    ##############
+
+    # Check for MPI wrapper being used and tweak down compiler options
+    # Comment out the Tweaking since it caused problems to mpich1.2.6.
+    # Need to investigate the reasons to tweak.
+    #if test "X-" == "X-$is_mpi"; then
+    #    PROD_FCFLAGS="-fast -s -Mnoframe"
+    #else
+    #    PROD_FCFLAGS="-O2 -s"
+    #fi
+    PROD_FCFLAGS="-fast -Mnoframe -fPIC"
+
+    #########
+    # Debug #
+    #########
+
+    DEBUG_FCFLAGS="-Mbounds -Mchkptr -Mdclchk -fPIC"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_FCFLAGS="-s"
+    SYMBOLS_FCFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_FCFLAGS="-Mprof=func,line"
+    # Use this for profiling with gprof
+    #PROFILE_FCFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_FCFLAGS=
+    DEBUG_OPT_FCFLAGS=
+    NO_OPT_FCFLAGS=
+
+    ############
+    # Warnings #
+    ############
+
+    ###########
+    # General #
+    ###########
+
+    FC_BASENAME=nvfortran
+    Fortran_COMPILER_ID=NVIDIA
+    F9XSUFFIXFLAG=""
+    FSEARCH_DIRS=""
+    # Uncomment the following to add something specific for FCFLAGS.
+    #FCFLAGS="$FCFLAGS"
+
+
+
+    #################
+    # Flags are set #
+    #################
+    f9x_flags_set=yes
+fi
+
+# Clear f9x info if no flags set
+if test "X-$f9x_flags_set" = "X-"; then
+  f9x_vendor=
+  f9x_version=
+fi
+
diff --git a/config/nvidia-flags b/config/nvidia-flags
new file mode 100644
index 00000000000..5cd9a08b74b
--- /dev/null
+++ b/config/nvidia-flags
@@ -0,0 +1,122 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# 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 COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# NVIDIA nvc compiler or a derivative.  It is careful not to do anything
+# if the compiler is not nvcc; otherwise `cc_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for nvc
+# unless a compiler version is already known
+#
+#   cc_vendor:    The compiler name: nvc
+#   cc_version:   Version number: 5.0-2, 5.2-2
+#
+if test X = "X$cc_flags_set"; then
+    cc_version="`$CC $CFLAGS -V 2>&1 |grep '^nvc '`"
+    if test X != "X$cc_version"; then
+        is_mpi="`$CC $CFLAGS -help 2>&1 |grep 'MPI'`"
+        cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
+        cc_version=`echo $cc_version |sed 's/nvc \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$CC' is NVIDIA $cc_vendor-$cc_version"
+
+        # Some version numbers
+        # NVIDIA version numbers are of the form: "major.minor-patch"
+        cc_vers_major=`echo $cc_version | cut -f1 -d.`
+        cc_vers_minor=`echo $cc_version | cut -f2 -d. | cut -f1 -d-`
+        cc_vers_patch=`echo $cc_version | cut -f2 -d. | cut -f2 -d-`
+        test -n "$cc_vers_major" || cc_vers_major=0
+        test -n "$cc_vers_minor" || cc_vers_minor=0
+        test -n "$cc_vers_patch" || cc_vers_patch=0
+        cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
+    fi
+fi
+
+# Common PGI flags for various situations
+if test "X-nvc" = "X-$cc_vendor" -o "X-nvcc" = "X-$cc_vendor"; then
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
+
+    arch=
+    # Architecture-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "$host_os-$host_cpu" in
+    #    *-i686)
+    #        arch="-march=i686"
+    #        ;;
+    #esac
+
+    # Host-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "`hostname`" in
+    #    sleipnir.ncsa.uiuc.edu)
+    #        arch="$arch -pipe"
+    #        ;;
+    #esac
+
+    ###########
+    # General #
+    ###########
+
+    # Default to C99 standard.
+    H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=warn"
+
+    ##############
+    # Production #
+    ##############
+
+    # NDEBUG is handled explicitly by the configure script
+    PROD_CFLAGS="-fast"
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    DEBUG_CFLAGS="-Mbounds"
+
+    ###########
+    # Symbols #
+    ###########
+
+    NO_SYMBOLS_CFLAGS="-s"
+    SYMBOLS_CFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
+
+    PROFILE_CFLAGS="-Mprof=func,line"
+    # Use this for profiling with gprof
+    #PROFILE_CFLAGS="-pg"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CFLAGS="-O4"
+    DEBUG_OPT_CFLAGS="-gopt -O2"
+    NO_OPT_CFLAGS="-O0"
+
+    #################
+    # Flags are set #
+    #################
+    cc_flags_set=yes
+fi
+
+# Clear cc info if no flags set
+if test "X-$cc_flags_set" = "X-"; then
+    cc_vendor=
+    cc_version=
+fi