diff --git a/CHANGELOG.md b/CHANGELOG.md
index e80f3598..8b494f07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,38 @@
 
 
+## v0.2.5
+
+### Merged PRs:
+
+- [#1048](https://github.com/TokTok/c-toxcore/pull/1048) Fix error message in m_send_generic_message
+- [#1047](https://github.com/TokTok/c-toxcore/pull/1047) Remove unused `m_callback_log` function.
+- [#1041](https://github.com/TokTok/c-toxcore/pull/1041) Avoid multiple for-next expressions.
+- [#1037](https://github.com/TokTok/c-toxcore/pull/1037) Run all tests in the Autotools build
+- [#1035](https://github.com/TokTok/c-toxcore/pull/1035) Fix problems with initial connections and name-setting in conferences
+- [#1032](https://github.com/TokTok/c-toxcore/pull/1032) Use auto_test fixture in some tests and standardise filenames
+- [#1030](https://github.com/TokTok/c-toxcore/pull/1030) Make a separate `struct Tox` containing the Messenger.
+- [#1029](https://github.com/TokTok/c-toxcore/pull/1029) Add `by_id` and `get_id` functions, renaming from `*_uid`.
+- [#1025](https://github.com/TokTok/c-toxcore/pull/1025) More fixed_width ints and incorporating file_saving_test.c
+- [#1023](https://github.com/TokTok/c-toxcore/pull/1023) Run buildifier on c-toxcore BUILD files.
+- [#1022](https://github.com/TokTok/c-toxcore/pull/1022) Make `resize` in `list.c` return bool instead of 0/1.
+- [#1021](https://github.com/TokTok/c-toxcore/pull/1021) Remove redundant casts to the same type.
+- [#1020](https://github.com/TokTok/c-toxcore/pull/1020) Add github usernames to TODOs.
+- [#1019](https://github.com/TokTok/c-toxcore/pull/1019) Synchronise parameter names in headers with those in the implementation.
+- [#1018](https://github.com/TokTok/c-toxcore/pull/1018) Reduce nesting by doing more early returns on error.
+- [#1017](https://github.com/TokTok/c-toxcore/pull/1017) Add missing braces in dht_test.c.
+- [#1011](https://github.com/TokTok/c-toxcore/pull/1011) Run Clang global static analysis on Travis.
+- [#1010](https://github.com/TokTok/c-toxcore/pull/1010) Avoid implementations in .h files or #including .c files.
+
+### Closed issues:
+
+- [#1028](https://github.com/TokTok/c-toxcore/issues/1028) qTox crashes 1-2 times a day after update to 0.2.4
+- [#1002](https://github.com/TokTok/c-toxcore/issues/1002) Implement an abstraction over pthread and windows thread synchronisation primitives
+
 ## v0.2.4
 
 ### Merged PRs:
 
+- [#1024](https://github.com/TokTok/c-toxcore/pull/1024) Release v0.2.4
 - [#1014](https://github.com/TokTok/c-toxcore/pull/1014) Use string comparison operator in configure.ac.
 - [#1013](https://github.com/TokTok/c-toxcore/pull/1013) Link -lsocket and -lnsl for socket functions on Solaris.
 - [#1012](https://github.com/TokTok/c-toxcore/pull/1012) Correct the max hostname length constant.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c760e351..b914b939 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ set(CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
 # versions in a synchronised way.
 set(PROJECT_VERSION_MAJOR "0")
 set(PROJECT_VERSION_MINOR "2")
-set(PROJECT_VERSION_PATCH "4")
+set(PROJECT_VERSION_PATCH "5")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # set .so library version / following libtool scheme
diff --git a/configure.ac b/configure.ac
index 5de53523..68ead33d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.65])
-AC_INIT([tox], [0.2.4])
+AC_INIT([tox], [0.2.5])
 AC_CONFIG_AUX_DIR(configure_aux)
 AC_CONFIG_SRCDIR([toxcore/net_crypto.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/so.version b/so.version
index a64c68ba..aef65524 100644
--- a/so.version
+++ b/so.version
@@ -11,6 +11,6 @@
 # For a full reference see:
 # https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
 
-CURRENT=6
+CURRENT=7
 REVISION=0
-AGE=4
+AGE=5
diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h
index 7cc58e3b..24360641 100644
--- a/toxcore/tox.api.h
+++ b/toxcore/tox.api.h
@@ -182,7 +182,7 @@ const VERSION_MINOR                = 2;
  * The patch or revision number. Incremented when bugfixes are applied without
  * changing any functionality or API or ABI.
  */
-const VERSION_PATCH                = 4;
+const VERSION_PATCH                = 5;
 
 /**
  * A macro to check at preprocessing time whether the client code is compatible
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 35ff19e7..2c40389b 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -183,7 +183,7 @@ uint32_t tox_version_minor(void);
  * The patch or revision number. Incremented when bugfixes are applied without
  * changing any functionality or API or ABI.
  */
-#define TOX_VERSION_PATCH              4
+#define TOX_VERSION_PATCH              5
 
 uint32_t tox_version_patch(void);