diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b0e9a3c..ef158836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,23 @@ All notable changes to this project will be documented in this file.
 - Full rewrite of the app for Nextcloud 22
 - Type of Circles are gone, replaced by config flags  
 - first implementation of federated circles (2.0)
-- first implementation of new ExtendedQueryBuilder
-  
-  (changelog in progress)
+- first implementation of new ExtendedQueryBuilder  
+- Important: Circles and Circle memberships will be migrated with cron jobs.
+  However, this can take a long time with large databases. The process can
+  be speed up by executing the migrations manually. This can still take a
+  couple of days. To migrate the Circles and memberships, use `occ`:
+  ```bash
+  occ circles:sync --migration [--force]
+  occ circles:memberships --all
+  ```
+  It may happen that the `circles:sync` command does not migrate all Circles
+  in the first run. Re-run this command until all Circle are migrated. You can
+  check if all Circles are migrated with the following SQL query:
+  ```sql
+  SELECT COUNT(unique_id) FROM nc_circle_circles WHERE unique_id NOT IN (SELECT unique_id FROM nc_circles_circle);
+  ```
+
+(changelog in progress)
   
 
 ### 0.20.6