diff --git a/docs/CMake.rst b/docs/CMake.rst
index fca02ef889e..957c5d4bb1c 100644
--- a/docs/CMake.rst
+++ b/docs/CMake.rst
@@ -389,6 +389,8 @@ for a quick solution.
 Also see the `LLVM-specific variables`_ section for variables used when
 cross-compiling.
 
+.. _Embedding LLVM in your project:
+
 Embedding LLVM in your project
 ==============================
 
diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst
index 824df043d0e..a08483b0fc1 100644
--- a/docs/ReleaseNotes.rst
+++ b/docs/ReleaseNotes.rst
@@ -235,6 +235,16 @@ Changes to CMake build system
   the ``install`` target is invoked then the built documentation will be
   installed.  See :ref:`LLVM-specific variables`.
 
+* Both the Autoconf/Makefile and CMake build systems now generate
+  ``LLVMConfig.cmake`` (and other files) to export installed libraries. This
+  means that projects using CMake to build against LLVM libraries can now build
+  against an installed LLVM built by the Autoconf/Makefile system. See
+  :ref:`Embedding LLVM in your project` for details.
+
+* Use of ``llvm_map_components_to_libraries()`` by external projects is
+  deprecated and the new ``llvm_map_components_to_libnames()`` should be used
+  instead.
+
 External Open Source Projects Using LLVM 3.5
 ============================================