diff --git a/NEWS b/NEWS
index 7dde119..1dae070 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Overview of changes leading to 2.6.5
+Friday, April 17, 2020
+====================================
+- Add experimental meson build system.  Autotools is still the primary
+  and supported build system.
+- AAT is now always preferred for horizontal scripts when both AAT and OT
+  layout tables exist at the same time.
+- Subsetter improvements.
+- New API:
++hb_ft_font_lock_face()
++hb_ft_font_unlock_face()
+
+
 Overview of changes leading to 2.6.4
 Monday, October 29, 2019
 ====================================
diff --git a/configure.ac b/configure.ac
index 4125756..1733a63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [2.6.4],
+        [2.6.5],
         [https://github.com/harfbuzz/harfbuzz/issues/new],
         [harfbuzz],
         [http://harfbuzz.org/])
diff --git a/meson.build b/meson.build
index 8ca46b9..b8f1228 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('harfbuzz', 'c', 'cpp',
   meson_version: '>= 0.47.0',
   default_options : ['cpp_std=c++11'],
-  version: '2.6.4')
+  version: '2.6.5')
 
 warning('Meson is not our main build system yet, don\'t use it for packaging HarfBuzz for *nix distros for now')
 
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 2a7b0de..d1eeeff 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -195,7 +195,7 @@
  *
  *
  * Return value:
- * Since: REPLACEME
+ * Since: 2.6.5
  **/
 FT_Face
 hb_ft_font_lock_face (hb_font_t *font)
@@ -217,7 +217,7 @@
  *
  *
  * Return value:
- * Since: REPLACEME
+ * Since: 2.6.5
  **/
 void
 hb_ft_font_unlock_face (hb_font_t *font)
diff --git a/src/hb-version.h b/src/hb-version.h
index a564e9f..545f1b2 100644
--- a/src/hb-version.h
+++ b/src/hb-version.h
@@ -38,9 +38,9 @@
 
 #define HB_VERSION_MAJOR 2
 #define HB_VERSION_MINOR 6
-#define HB_VERSION_MICRO 4
+#define HB_VERSION_MICRO 5
 
-#define HB_VERSION_STRING "2.6.4"
+#define HB_VERSION_STRING "2.6.5"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \