diff --git a/Help/generator/Ninja.rst b/Help/generator/Ninja.rst
index ef0e28be0d..3bbd9dcbe0 100644
--- a/Help/generator/Ninja.rst
+++ b/Help/generator/Ninja.rst
@@ -21,3 +21,13 @@ are generated:
 
 ``sub/dir/package``
   Runs the package step in the subdirectory, if any.
+
+Fortran Support
+^^^^^^^^^^^^^^^
+
+The ``Ninja`` generator conditionally supports Fortran when the ``ninja``
+tool has the required features.  As of this version of CMake the needed
+features have not been integrated into upstream Ninja.  Kitware maintains
+a branch of Ninja with the required features on `github.com/Kitware/ninja`_.
+
+.. _`github.com/Kitware/ninja`: https://github.com/Kitware/ninja/tree/features-for-fortran#readme
diff --git a/Help/release/dev/ninja-fortran.rst b/Help/release/dev/ninja-fortran.rst
new file mode 100644
index 0000000000..612b1ff813
--- /dev/null
+++ b/Help/release/dev/ninja-fortran.rst
@@ -0,0 +1,6 @@
+ninja-fortran
+-------------
+
+* The :generator:`Ninja` generator learned to conditionally support
+  Fortran when using a ``ninja`` tool that has the necessary features.
+  See generator documentation for details.