diff --git a/doc/src/Build_extras.rst b/doc/src/Build_extras.rst
index c4f9bf6aff..8468a773a6 100644
--- a/doc/src/Build_extras.rst
+++ b/doc/src/Build_extras.rst
@@ -646,7 +646,7 @@ They must be specified in uppercase.
       - GPU
       - Intel GPU Ponte Vecchio
 
-This list was last updated for version 3.7.1 of the Kokkos library.
+This list was last updated for version 4.0.0 of the Kokkos library.
 
 .. tabs::
 
diff --git a/doc/src/Intro_portability.rst b/doc/src/Intro_portability.rst
index 239eacd1b7..66b62a234e 100644
--- a/doc/src/Intro_portability.rst
+++ b/doc/src/Intro_portability.rst
@@ -12,7 +12,7 @@ Programming language standards
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Most of the C++ code currently requires a compiler compatible with the
-C++11 standard, the KOKKOS package currently requires C++14.  Most of
+C++11 standard, the KOKKOS package currently requires C++17.  Most of
 the Python code is written to be compatible with Python 3.5 or later or
 Python 2.7.  Some Python scripts *require* Python 3 and a few others
 still need to be ported from Python 2 to Python 3.
diff --git a/doc/src/Packages_details.rst b/doc/src/Packages_details.rst
index c9f19f4988..de9b54909f 100644
--- a/doc/src/Packages_details.rst
+++ b/doc/src/Packages_details.rst
@@ -1258,7 +1258,7 @@ Also see the :ref:`GPU <PKG-GPU>`, :ref:`OPT <PKG-OPT>`, :ref:`INTEL
 <PKG-INTEL>`, and :ref:`OPENMP <PKG-OPENMP>` packages, which have styles
 optimized for CPUs, KNLs, and GPUs.
 
-You must have a C++14 compatible compiler to use this package.
+You must have a C++17 compatible compiler to use this package.
 KOKKOS makes extensive use of advanced C++ features, which can
 expose compiler bugs, especially when compiling for maximum
 performance at high optimization levels. Please see the file
diff --git a/doc/src/Speed_kokkos.rst b/doc/src/Speed_kokkos.rst
index 569a24f1c2..28e98b78a2 100644
--- a/doc/src/Speed_kokkos.rst
+++ b/doc/src/Speed_kokkos.rst
@@ -26,23 +26,29 @@ task). These are Serial (MPI-only for CPUs and Intel Phi), OpenMP
 GPUs) and HIP (for AMD GPUs). You choose the mode at build time to
 produce an executable compatible with a specific hardware.
 
-.. admonition:: C++14 support
+.. admonition:: C++17 support
    :class: note
 
-   Kokkos requires using a compiler that supports the c++14 standard. For
-   some compilers, it may be necessary to add a flag to enable c++14 support.
-   For example, the GNU compiler uses the -std=c++14 flag. For a list of
+   Kokkos requires using a compiler that supports the c++17 standard. For
+   some compilers, it may be necessary to add a flag to enable c++17 support.
+   For example, the GNU compiler uses the -std=c++17 flag. For a list of
    compilers that have been tested with the Kokkos library, see the Kokkos
-   `README <https://github.com/kokkos/kokkos/blob/master/README.md>`_.
+   `Wiki <https://kokkos.github.io/kokkos-core-wiki/requirements.html>`_.
 
 .. admonition:: NVIDIA CUDA support
    :class: note
 
    To build with Kokkos support for NVIDIA GPUs, the NVIDIA CUDA toolkit
-   software version 9.0 or later must be installed on your system. See
+   software version 11.0 or later must be installed on your system. See
    the discussion for the :doc:`GPU package <Speed_gpu>` for details of
    how to check and do this.
 
+.. admonition:: AMD ROCm (HIP) support
+   :class: note
+
+   To build with Kokkos support for AMD GPUs, the AMD ROCm toolkit
+   software version 5.2.0 or later must be installed on your system.
+
 .. admonition:: CUDA and MPI library compatibility
    :class: note