diff --git a/Changelog b/Changelog
index 3debf64f3..493e3b21e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,21 @@
+0.30.7           (2026-03-05):
+* Enhancement: %GITHUB%/issues/2248 Switch layouts but without losing the handle
+* Bugfix: %GITHUB%/issues/2273 Potential use-after-free bug due to Ruby GC
+* Bugfix: %GITHUB%/issues/2277 Poor netlister performance in some cases
+* Enhancement: %GITHUB%/issues/2278 Option to hide markers frames
+* Bugfix: %GITHUB%/issues/2284 klayoutrc parse issue silently replaces config file
+* Bugfix: %GITHUB%/issues/2286 CLI arguments, '--help' / '--version' should be implemented
+* Enhancement: ReportDatabase#merge - a method to merge two report databases
+* Bugfix: double clicking an edge in partial mode opened the properties dialog, not setting a point
+* Bugfix: Python did not support downcasting of PolygonWithProperties to Polygon on Shapes#polygon for example
+* Bugfix: OASIS reader was not able to read S_GDS_PROPERTY from file level or under forward reference conditions
+* Enhancement: Adding an option '-of|--format' to strmxor and strmclip to specify the output format instead of taking it from the suffix
+* Bugfix: 'oasis_read_all_options' as always on in buddy tools
+* Bugfix: avoid a crash on application exit when using objects for user property values or names
+* Bugfix: Fixing a small glitch: drawing into a ghost cell is possible, but did not turn off the ghost cell flag
+* Bugfix: Fixing a potential segfault during layout painting due to a race condition (rare but happened)
+* Enhancement: Performance improvement for hierarchical processor - better parallelization in some cases
+
 0.30.6           (2026-02-07):
 * Bugfix: %GITHUB%/issues/2210 LayoutView::create_measure_ruler() creates incorrect rulers
 * Enhancement: %GITHUB%/issues/2214 Take selection modifer into account on release rather than on click
diff --git a/Changelog.Debian b/Changelog.Debian
index fab33ed72..3cb5cee9f 100644
--- a/Changelog.Debian
+++ b/Changelog.Debian
@@ -1,3 +1,10 @@
+klayout (0.30.7-1) unstable; urgency=low
+
+  * New features and bugfixes
+    - See changelog
+
+ -- Matthias Köfferlein <matthias@koefferlein.de>  Wed, 04 Mar 2026 18:58:50 +0100
+
 klayout (0.30.6-1) unstable; urgency=low
 
   * New features and bugfixes
diff --git a/version.sh b/version.sh
index 35ade8a69..a0d375e78 100644
--- a/version.sh
+++ b/version.sh
@@ -2,10 +2,10 @@
 # This script is sourced to define the main version parameters
 
 # The main version
-KLAYOUT_VERSION="0.30.6"
+KLAYOUT_VERSION="0.30.7"
 
 # The version used for PyPI (don't use variables here!)
-KLAYOUT_PYPI_VERSION="0.30.6"
+KLAYOUT_PYPI_VERSION="0.30.7"
 
 # The build date
 KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")