diff --git a/CHANGELOG.md b/CHANGELOG.md
index 101ba9f946..6a99fdf973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project are documented in this file.
The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
+## January 2025
+
+### Fixed
+
+- *de.itemis.mps.editor.diagram*: An issue was fixed where diagrams with sub-diagrams had ports at the wrong position when the diagram was first opened
+
+### Added
+
+- *de.itemis.mps.editor.diagram*: Some more options of the diagram component like the pan amount and minimum scaling can now be customized in the diagram editor
+
## December 2024
### Changed
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
index 456ac89165..2fa40edf53 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
@@ -94,9 +94,16 @@
+
+
+
+
+
+
+
@@ -4240,5 +4247,13 @@
+
+
+
+
+
+
+
+
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
index e7dca43407..f7068d4e5f 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
@@ -107,6 +107,9 @@
+
+
+
@@ -229,6 +232,11 @@
+
+
+
+
+
@@ -268,6 +276,7 @@
+
@@ -932,6 +941,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index 008f317161..f73738c2e6 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -6256,7 +6256,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+