diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index a5b95e4..14b7583 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -5,6 +5,8 @@
 ========= ========== ========================================================
 Version   Date       Changes
 ========= ========== ========================================================
+                     * Introduce class mappings (see :doc:`operations`)
+                       (closes: #5)
                      * Fix parameter interpolation across merged lists
                        (closes: #13).
                      * Caching of classes for performance reasons, especially
diff --git a/doc/source/operations.rst b/doc/source/operations.rst
index a110022..0819bfb 100644
--- a/doc/source/operations.rst
+++ b/doc/source/operations.rst
@@ -92,6 +92,14 @@
 can be assigned to each mapping by providing a space-separated list (class
 names cannot contain spaces anyway).
 
+.. warning::
+
+  The class mappings do not really belong in the configuration file, as they
+  are data, not configuration inmformation. Therefore, they are likely going
+  to move elsewhere, but I have not quite figured out to where. Most likely,
+  there will be an additional file, specified in the configuration file, which
+  then lists the mappings.
+
 Note that mappings are not designed to replace node definitions. Mappings can
 be used to pre-populate the classes of existing nodes, but you still need to
 define all nodes (and if only to allow them to be enumerated for the