diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f19171e5f12a1f83c70735f6b0ec0060b497995c..fbe53df64e474346ff9dae22d4a90f9bf357b882 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -77,7 +77,7 @@ repos:
       - id: insert-license
         name: insert CC BY-SA license for md files
         files: \.md$
-        exclude: ^.gitlab
+        exclude: ^(\.gitlab|changelog)
         args:
           - --license-filepath
           - LICENSES/headers/CC-BY-SA-4.0.txt
diff --git a/changelog/fragments/1630.added.md b/changelog/fragments/1630.added.md
new file mode 100644
index 0000000000000000000000000000000000000000..4516ae4cfa7dd22bcd1d8694c256ad1afabd2aed
--- /dev/null
+++ b/changelog/fragments/1630.added.md
@@ -0,0 +1,2 @@
+- The `BasePost` has a `use_best_iteration_history` option to plot the best iteration history rather than the iteration history.
+- The `OptimizationDataset` has a `get_best_iteration_history` method to extract the history of the best iteration.
diff --git a/changelog/fragments/1630.added.rst b/changelog/fragments/1630.added.rst
deleted file mode 100644
index d3a4dd9f0311e83e40c0a41d8faaa1bdadd0c211..0000000000000000000000000000000000000000
--- a/changelog/fragments/1630.added.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-- The ``BasePost`` has a ``use_best_iteration_history`` option to plot the best iteration history rather than the iteration history.
-- The ``OptimizationDataset`` has a ``get_best_iteration_history`` method to extract the history of the best iteration.
diff --git a/changelog/fragments/1654.added.md b/changelog/fragments/1654.added.md
new file mode 100644
index 0000000000000000000000000000000000000000..4705c1fbc490ec2e9b911e6638669ecf3e54caf7
--- /dev/null
+++ b/changelog/fragments/1654.added.md
@@ -0,0 +1 @@
+`CouplingStructure` and `DependencyGraph` support any kind of `BaseDiscipline`.
diff --git a/changelog/fragments/1654.added.rst b/changelog/fragments/1654.added.rst
deleted file mode 100644
index 9583cb1528a218e588f51a38a9f1cdf3e563eb5b..0000000000000000000000000000000000000000
--- a/changelog/fragments/1654.added.rst
+++ /dev/null
@@ -1 +0,0 @@
-``CouplingStructure`` and ``DependencyGraph`` support any kind of ``BaseDiscipline``.
diff --git a/changelog/fragments/1662.fixed.md b/changelog/fragments/1662.fixed.md
new file mode 100644
index 0000000000000000000000000000000000000000..77a9bdef2648ba361faf6a7a36cdfeaa847a9f8e
--- /dev/null
+++ b/changelog/fragments/1662.fixed.md
@@ -0,0 +1 @@
+The `compare_dict_of_arrays` function now works witth arrays of string with multiple components.
diff --git a/changelog/fragments/1662.fixed.rst b/changelog/fragments/1662.fixed.rst
deleted file mode 100644
index 972f51a39c2965440f4443756e1f87d24e53948c..0000000000000000000000000000000000000000
--- a/changelog/fragments/1662.fixed.rst
+++ /dev/null
@@ -1 +0,0 @@
-The ``compare_dict_of_arrays`` function now works witth arrays of string with multiple components.
diff --git a/changelog/fragments/2137.changed.md b/changelog/fragments/2137.changed.md
new file mode 100644
index 0000000000000000000000000000000000000000..8b7cceaba41f0c61b8f131857e916c2aa9c4833c
--- /dev/null
+++ b/changelog/fragments/2137.changed.md
@@ -0,0 +1,2 @@
+The documentation is now generated by Mkdocs (instead of Sphinx).
+It is then written in Markdown (.md) instead of reStructuredText Primer (.rst).