diff --git a/.appveyor.yml b/.appveyor.yml
index 58900e0976a03ef2aecc7b24fd6ca2f67fcafea6_LmFwcHZleW9yLnltbA==..f7cc251cdad48cad268b951debf877e07e299ac6_LmFwcHZleW9yLnltbA== 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.2.4.{build}
+version: 0.2.5.{build}
 
 image:
 - Visual Studio 2015
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58900e0976a03ef2aecc7b24fd6ca2f67fcafea6_Q01ha2VMaXN0cy50eHQ=..f7cc251cdad48cad268b951debf877e07e299ac6_Q01ha2VMaXN0cy50eHQ= 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 set (YAML_VERSION_MAJOR 0)
 set (YAML_VERSION_MINOR 2)
-set (YAML_VERSION_PATCH 4)
+set (YAML_VERSION_PATCH 5)
 set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")
 
 option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF)
diff --git a/Changes b/Changes
index 58900e0976a03ef2aecc7b24fd6ca2f67fcafea6_Q2hhbmdlcw==..f7cc251cdad48cad268b951debf877e07e299ac6_Q2hhbmdlcw== 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,29 @@
+0.2.5 2020-06-01
+
+https://github.com/yaml/libyaml/pull/105
+Allow question marks in plain scalars in flow collections
+
+https://github.com/yaml/libyaml/pull/186
+Emitter: Don't output trailing space for empty scalar nodes
+
+https://github.com/yaml/libyaml/pull/185
+Emitter: Output space after an alias mapping key
+
+https://github.com/yaml/libyaml/pull/187
+Add -h and --flow (on|off|keep) to run-*-test-suite
+
+https://github.com/yaml/libyaml/pull/182
+Remove unnecessary include and malloc
+
+https://github.com/yaml/libyaml/pull/177
+Add specific files back to .gitignore
+
+https://github.com/yaml/libyaml/pull/181
+Output error position in run-parser-test-suite.c
+
+https://github.com/yaml/libyaml/pull/191
+A couple patches to improve test suite support
+
 0.2.4 2020-04-19
 
   - https://github.com/yaml/libyaml/pull/143
diff --git a/announcement.msg b/announcement.msg
index 58900e0976a03ef2aecc7b24fd6ca2f67fcafea6_YW5ub3VuY2VtZW50Lm1zZw==..f7cc251cdad48cad268b951debf877e07e299ac6_YW5ub3VuY2VtZW50Lm1zZw== 100644
--- a/announcement.msg
+++ b/announcement.msg
@@ -1,5 +1,5 @@
 From: Tina Müller <post@tinita.de>
 To: yaml-core@lists.sourceforge.net
-Subject: [ANN] LibYAML-0.2.4: A new release
+Subject: [ANN] LibYAML-0.2.5: A new release
 
 =========================
@@ -4,6 +4,6 @@
 
 =========================
- Announcing LibYAML-0.2.4
+ Announcing LibYAML-0.2.5
 =========================
 
 A new release of LibYAML is now available:
@@ -7,9 +7,7 @@
 =========================
 
 A new release of LibYAML is now available:
-https://github.com/yaml/libyaml/tree/0.2.4
-
-This fixes a bug introduced in the 0.2.3 release.
+https://github.com/yaml/libyaml/tree/0.2.5
 
 The LibYAML project is now maintained by the YAML community. Planning happens
 on the #yaml-dev and #libyaml IRC channels on irc.freenode.net.
@@ -18,8 +16,30 @@
 Changes
 =======
 
-https://github.com/yaml/libyaml/pull/143 -- Add packaging/docker-dist to Makefile.am
-https://github.com/yaml/libyaml/pull/174 -- Fix logic for document end before directive
+
+https://github.com/yaml/libyaml/pull/187
+Add -h and --flow (on|off|keep) to run-*-test-suite
+
+https://github.com/yaml/libyaml/pull/182
+Remove unnecessary include and malloc
+
+https://github.com/yaml/libyaml/pull/177
+Add specific files back to .gitignore
+
+https://github.com/yaml/libyaml/pull/181
+Output error position in run-parser-test-suite.c
+
+https://github.com/yaml/libyaml/pull/105
+Allow question marks in plain scalars in flow collections
+
+https://github.com/yaml/libyaml/pull/186
+Emitter: Don't output trailing space for empty scalar nodes
+
+https://github.com/yaml/libyaml/pull/185
+Emitter: Output space after an alias mapping key
+
+https://github.com/yaml/libyaml/pull/191
+A couple patches to improve test suite support
 
 
 Resources
@@ -51,7 +71,6 @@
 The following people are responsible for maintaining LibYAML:
 
 * Ingy döt Net
-* Tina Mueller
 
 and many thanks to all who have contribributed!
 See: https://github.com/yaml/libyaml/pulls
diff --git a/configure.ac b/configure.ac
index 58900e0976a03ef2aecc7b24fd6ca2f67fcafea6_Y29uZmlndXJlLmFj..f7cc251cdad48cad268b951debf877e07e299ac6_Y29uZmlndXJlLmFj 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # Define the package version numbers and the bug reporting link.
 m4_define([YAML_MAJOR], 0)
 m4_define([YAML_MINOR], 2)
-m4_define([YAML_PATCH], 4)
+m4_define([YAML_PATCH], 5)
 m4_define([YAML_BUGS], [https://github.com/yaml/libyaml/issues/new])
 
 # Define the libtool version numbers; check the Autobook, Section 11.4.
@@ -19,7 +19,7 @@
 #           YAML_AGE = 0
 m4_define([YAML_RELEASE], 0)
 m4_define([YAML_CURRENT], 2)
-m4_define([YAML_REVISION], 8)
+m4_define([YAML_REVISION], 9)
 m4_define([YAML_AGE], 0)
 
 # Initialize autoconf & automake.