diff --git a/Changelog b/Changelog
index 4c08a6981..7e035b0c2 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,14 @@
-0.25.5          (xxxx-xx-xx):
+0.25.5          (2018-09-19):
 
 * Bugfix: https://github.com/klayoutmatthias/klayout/issues/162
        GDS2 LIBNAME was not maintained on "File/Save".
+* Bugfix: https://github.com/klayoutmatthias/klayout/issues/166
+       Internal error when writing GDS files (breaking of polygons)
+* Bugfix: some potential memory corruption issues fixed
+       During the efforts for making the code base compatible
+       with MSVC, some potential candidates for memory corruption
+       have been identified and fixed. 
+       These fixes are included in this release.
 
 0.25.4          (2018-08-25):
 * Bugfix: https://github.com/klayoutmatthias/klayout/issues/121
diff --git a/Changelog.Debian b/Changelog.Debian
index 979733773..2075bc6af 100644
--- a/Changelog.Debian
+++ b/Changelog.Debian
@@ -1,3 +1,10 @@
+klayout (0.25.5-1) unstable; urgency=low
+
+  * New features and bugfixes
+    - See changelog
+
+ -- Matthias Köfferlein <matthias@koefferlein.de>  Wed, 19 Sep 2018 22:04:35 +0200
+
 klayout (0.25.4-1) unstable; urgency=low
 
   * New features and bugfixes
diff --git a/version.sh b/version.sh
index 869004eda..3eef2e90e 100644
--- a/version.sh
+++ b/version.sh
@@ -2,7 +2,7 @@
 # This script is sourced to define the main version parameters
 
 # The main version
-KLAYOUT_VERSION="0.25.4"
+KLAYOUT_VERSION="0.25.5"
 
 # The build date
 KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")