diff --git a/Changelog b/Changelog
index 4b7f92892..5ea50cc01 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,30 @@
+0.30.5           (2025-11-09):
+* Enhancement: %GITHUB%/issues/2147 Feature request: collect multiple files into a single library if the library name is identical
+* Bugfix: %GITHUB%/issues/2156 Crash when loading library with mabrains klayout_lib_manager
+* Bugfix: %GITHUB%/issues/2160 Compiling with QT6 and -without-qt-network
+* Bugfix: %GITHUB%/issues/2162 Select rectangle, query => coredump. asan: heap-use-after-free
+* Enhancement: %GITHUB%/issues/2168 Reloading cell libraries does not work
+* Bugfix: %GITHUB%/issues/2169 Tech-specific "python" folder not added to path
+* Enhancement: %GITHUB%/issues/2170 Ergonomics / Interface / "Select Cell" dialog: position of the "Show all cells" tick box 
+* Enhancement: %GITHUB%/issues/2172 Finer-grained library API
+* Enhancement: %GITHUB%/issues/2174 Publish "on_current_layer_changed_event" of LayoutView
+* Enhancement: %GITHUB%/issues/2175 True text bounding box for labels in Python/Ruby
+* Enhancement: %GITHUB%/issues/2176 Allow placing vias in all modes
+* Enhancement: %GITHUB%/issues/2180 Feature request: View->Show Unresolved References
+* Enhancement: %GITHUB%/issues/2183 strmxor --deep, --drop-empty-cells should be the default
+* Bugfix: %GITHUB%/issues/2191 LIBNAME is not maintained in GDS in "File/Save"
+* Bugfix: %GITHUB%/issues/2194 Forward/backward features can't be bound to a key
+* Bugfix: %GITHUB%/issues/2195 Feature request: extend PCell API to provide a suitable cell name including PCell parameters
+* Bugfix: %GITHUB%/issues/2201 Net Tracer "Trace path" not working when zooming
+* Bugfix: %GITHUB%/issues/2208 DRC Failed to report results correctly
+* Bugfix: Fixing problem with HM decomposition with non-trivial triangulation constraints
+* Enhancement: Cursor now snaps to center of edges and centers of boxes too
+* Enhancement: Experimental integration of the LStream format
+  Details about the LStream format and the motivation can be found here: 
+  https://codeberg.org/klayoutmatthias/lstream/src/branch/main/doc/doc.md
+  If you encounter problems building KLayout, you can use the -nolstream option 
+  in the build script to disable this module.
+  
 0.30.4           (2025-09-09):
 * Bugfix: %GITHUB%/issues/2110 Feature request: make unresolved references visible and editable in the layout view
 * Bugfix: %GITHUB%/issues/2111 Internal error on R extraction
diff --git a/Changelog.Debian b/Changelog.Debian
index 11ca2f9f6..c10903e01 100644
--- a/Changelog.Debian
+++ b/Changelog.Debian
@@ -1,3 +1,10 @@
+klayout (0.30.5-1) unstable; urgency=low
+
+  * New features and bugfixes
+    - See changelog
+
+ -- Matthias Köfferlein <matthias@koefferlein.de>  Sun, 09 Nov 2025 18:31:12 +0100
+
 klayout (0.30.4-1) unstable; urgency=low
 
   * New features and bugfixes
diff --git a/version.sh b/version.sh
index 7e1fd272e..a2c426cfd 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.4"
+KLAYOUT_VERSION="0.30.5"
 
 # The version used for PyPI (don't use variables here!)
-KLAYOUT_PYPI_VERSION="0.30.4-1"
+KLAYOUT_PYPI_VERSION="0.30.5"
 
 # The build date
 KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")