diff --git a/changelog.rst b/changelog.rst
index 351f37675568..9a875eea72b5 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -23,6 +23,14 @@ Check https://github.com/conan-io/conan for issues and more details about develo
   Read more about the :ref:`Conan stability commitment<stability>`.
 
 
+1.8.1 (??-??-2018)
+------------------
+
+  **Breaking changes**
+
+- Feature: **[Experimental]** Workspaces generate a *conanws.cmake* file instead of a root *CMakeLists.txt*. You have to write the latter yourself (and include the newly generated file).
+
+
 1.8.0 (9-October-2018)
 -----------------------
 
@@ -151,7 +159,6 @@ Check https://github.com/conan-io/conan for issues and more details about develo
 - BugFix: Fixed detection of a valid repository for Git in the SCM feature.
 
 
-
 1.6.1 (27-July-2018)
 --------------------
 
diff --git a/developing_packages/workspaces.rst b/developing_packages/workspaces.rst
index dca8dadb219b..3d6a6ac052af 100644
--- a/developing_packages/workspaces.rst
+++ b/developing_packages/workspaces.rst
@@ -81,7 +81,20 @@ Note that nothing will really be installed in the local cache. All the dependenc
 Also, all the generated *conanbuildinfo.cmake* files for the dependencies are installed in the *build* folder. You can inspect them to check
 that the paths they define for their dependencies are user folders. They don't point to the local cache.
 
-As defined in the *conanws.yml*, a root *CMakeLists.txt* is generated for us. We can use it to generate the super-project and build it:
+Additionally, a *conanws.cmake* file was generated for us in the build folder. This file contains a list of *add_subdirectory* commands. It will be updated everytime you run *conan install*, we only have to include it in our root *CMakeLists.txt*:
+
+.. code-block:: cmake
+
+      cmake_minimum_required(VERSION 3.3)
+
+      project(Hello VERSION 0.1 LANGUAGES CXX)
+
+      set(CMAKE_CXX_STANDARD 11)
+      set(CMAKE_CXX_EXTENSIONS OFF)
+
+      include(${CMAKE_CURRENT_BINARY_DIR}/conanws.cmake)
+
+Now, we can generate the super-project and build it:
 
 .. code-block:: bash