diff --git a/COPYRIGHT b/COPYRIGHT
index 686af02c0..4d49b0a1b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 klayout is packaged by Peter C.S. Scholtens <peter.scholtens@xs4all.nl>
 and Matthias Köfferlein <matthias@koefferlein.de>
-and was obtained from https://www.klayout.org/downloads/source/klayout-0.25.3.tar.gz
+and was obtained from https://www.klayout.org/downloads/source/klayout-0.25.4.tar.gz
 
 Authors:
 	Matthias Köfferlein
diff --git a/Changelog b/Changelog
index 792abaa2f..da05cbe2f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,19 @@
+0.25.3          (2018-07-11):
+* Bugfix: https://github.com/klayoutmatthias/klayout/issues/121
+       Issue with multiple reads of GDS2 layouts including PCells
+* Bugfix: https://github.com/klayoutmatthias/klayout/issues/134
+       Error in cell.fill_region caused by big polygon with 
+       spikes
+* Bugfix: https://github.com/klayoutmatthias/klayout/issues/139
+       Libraries have not been reassigned when loading a GDS file
+       from command line (does not happen on File/Open)
+* Bugfix: 8 bit indexed GIF images can be used for package icons now
+* Enhancement: Selection now shows PCell display names
+       Before, the internal name was shown for instances
+* Enhancement: There is an option in the View menu to show or hide markers
+       Markers may hide layout under them. With this feature you can
+       quickly disable all markers and the layout becomes visible.
+
 0.25.3          (2018-05-03):
 
 * Enhancement: Compile option to use libcurl instead of QtNetwork
diff --git a/Changelog.Debian b/Changelog.Debian
index 3fbacb5a0..4ab5c18a3 100644
--- a/Changelog.Debian
+++ b/Changelog.Debian
@@ -1,3 +1,10 @@
+klayout (0.25.4-1) unstable; urgency=low
+
+  * New features and bugfixes
+    - See changelog
+
+ -- Matthias Köfferlein <matthias@koefferlein.de>  Wed, 11 Jul 2018 00:40:05 +0200
+
 klayout (0.25.3-1) unstable; urgency=low
 
   * New features and bugfixes
diff --git a/version.sh b/version.sh
index d6dca8179..869004eda 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.3"
+KLAYOUT_VERSION="0.25.4"
 
 # The build date
 KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")