diff --git a/.mailmap b/.mailmap
index 54f6514527..ea15651170 100644
--- a/.mailmap
+++ b/.mailmap
@@ -45,6 +45,7 @@ Mathias Goncalves <mathiasg@mit.edu> mathiasg <mathiasg@mit.edu>
 Matthew Cieslak <mattcieslak@gmail.com> Matt Cieslak <mattcieslak@gmail.com>
 Michael Hanke <michael.hanke@gmail.com> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
+Michiel Cottaar <MichielCottaar@protonmail.com> Michiel Cottaar <MichielCottaar@protonmail.ch>
 Ly Nguyen <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>
 Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
 Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
diff --git a/.zenodo.json b/.zenodo.json
index 562d42e00c..16555380a4 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -197,6 +197,9 @@
     {
       "name": "Fauber, Bennet"
     },
+    {
+      "name": "Panfilov, Egor"
+    },
     {
       "affiliation": "McGill University",
       "name": "Poline, Jean-Baptiste",
@@ -249,6 +252,9 @@
       "name": "Gonzalez, Ivan",
       "orcid": "0000-0002-6451-6909"
     },
+    {
+      "name": "Palasubramaniam, Jath"
+    },
     {
       "name": "Lecher, Justin"
     },
diff --git a/Changelog b/Changelog
index e2f621e4cb..3ca4062a69 100644
--- a/Changelog
+++ b/Changelog
@@ -25,8 +25,42 @@ Eric Larson (EL), Demian Wassermann, and Stephan Gerhard.
 
 References like "pr/298" refer to github pull request numbers.
 
+2.5.0 (To be decided)
+=====================
+
+Thanks for the test ECAT file and fix provided by Andrew Crabb.
+
+Enhancements
+------------
+* Add SerializableImage class with to/from_bytes methods (pr/644) (CM,
+  reviewed by MB)
+* Check CIFTI-2 data shape matches shape described by header (pr/774)
+  (Michiel Cottaar, reviewed by CM)
+
+Bug fixes
+---------
+* Handle stricter numpy casting rules in tests (pr/768) (CM)
+  reviewed by PM)
+* TRK header fields flipped in files written on big-endian systems
+  (pr/782) (CM, reviewed by YOH, MB)
+* Load multiframe ECAT images with Python 3 (CM and Andrew Crabb)
+
+Maintenance
+-----------
+* Fix CodeCov paths on Appveyor for more accurate coverage (pr/769) (CM)
+* Move to setuptools and reduce use ``nisext`` functions (pr/764) (CM,
+  reviewed by YOH)
+* Better handle test setup/teardown (pr/785) (CM, reviewed by YOH)
+
+API changes and deprecations
+----------------------------
+* Effect threatened warnings and set some deprecation timelines (pr/755) (CM)
+  * Trackvis methods now default to v2 formats
+  * ``nibabel.trackvis`` scheduled for removal in nibabel 4.0
+  * ``nibabel.minc`` and ``nibabel.MincImage`` will be removed in nibabel 3.0
+
 2.4.1 (Monday 27 May 2019)
-============================
+==========================
 
 Contributions from Egor Pafilov, Jath Palasubramaniam, Richard Nemec, and
 Dave Allured.
diff --git a/nibabel/info.py b/nibabel/info.py
index 4fa1b44b1c..fcb912734c 100644
--- a/nibabel/info.py
+++ b/nibabel/info.py
@@ -19,8 +19,8 @@
 _version_major = 2
 _version_minor = 5
 _version_micro = 0
-_version_extra = 'dev'
-# _version_extra = ''
+# _version_extra = 'dev'
+_version_extra = ''
 
 # Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
 __version__ = "%s.%s.%s%s" % (_version_major,