diff --git a/NEWS b/NEWS
index 20bb21b..cbec265 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+Overview of changes leading to 2.6.0
+Tuesday, August 13, 2019
+====================================
+- New OpenType metrics, baseline, and metadata table access APIs.
+- New API to set font variations to a named-instance.
+- New hb-gdi.h header and API for creating hb_face_t from HFONT.
+- Amalgam: Provide a single-file harfbuzz.cc file for easier alternate building.
+- More size-reduction configurable options, enabled by HB_TINY.
+- New API:
++hb_font_set_var_named_instance()
++hb_gdi_face_create()
++hb_ot_layout_baseline_tag_t
++hb_ot_layout_get_baseline()
++hb_ot_meta_tag_t
++hb_ot_meta_get_entry_tags()
++hb_ot_meta_reference_entry()
++hb_ot_metrics_tag_t
++hb_ot_metrics_get_position()
++hb_ot_metrics_get_variation()
++hb_ot_metrics_get_x_variation()
++hb_ot_metrics_get_y_variation()
+
+
 Overview of changes leading to 2.5.3
 Wednesday, June 26, 2019
 ====================================
diff --git a/configure.ac b/configure.ac
index cebb10a..95c55c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [2.5.3],
+        [2.6.0],
         [https://github.com/harfbuzz/harfbuzz/issues/new],
         [harfbuzz],
         [http://harfbuzz.org/])
diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml
index 2e4b35c..433c206 100644
--- a/docs/harfbuzz-docs.xml
+++ b/docs/harfbuzz-docs.xml
@@ -133,6 +133,10 @@
       <index id="api-index-full"><title>API Index</title><xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include></index>
       <index id="deprecated-api-index" role="deprecated"><title>Index of deprecated API</title><xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include></index>
 
+      <index id="api-index-2-6-0" role="2.6.0"><title>Index of new symbols in 2.6.0</title><xi:include href="xml/api-index-2.6.0.xml"><xi:fallback /></xi:include></index>
+      <index id="api-index-2-5-0" role="2.5.0"><title>Index of new symbols in 2.5.0</title><xi:include href="xml/api-index-2.5.0.xml"><xi:fallback /></xi:include></index>
+      <index id="api-index-2-4-0" role="2.4.0"><title>Index of new symbols in 2.4.0</title><xi:include href="xml/api-index-2.4.0.xml"><xi:fallback /></xi:include></index>
+      <index id="api-index-2-3-0" role="2.3.0"><title>Index of new symbols in 2.3.0</title><xi:include href="xml/api-index-2.3.0.xml"><xi:fallback /></xi:include></index>
       <index id="api-index-2-2-0" role="2.2.0"><title>Index of new symbols in 2.2.0</title><xi:include href="xml/api-index-2.2.0.xml"><xi:fallback /></xi:include></index>
       <index id="api-index-2-1-0" role="2.1.0"><title>Index of new symbols in 2.1.0</title><xi:include href="xml/api-index-2.1.0.xml"><xi:fallback /></xi:include></index>
       <index id="api-index-2-0-0" role="2.0.0"><title>Index of new symbols in 2.0.0</title><xi:include href="xml/api-index-2.0.0.xml"><xi:fallback /></xi:include></index>
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 44953c9..e6339cd 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -1890,7 +1890,7 @@
  *
  * Sets design coords of a font from a named instance index.
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  */
 void
 hb_font_set_var_named_instance (hb_font_t *font,
diff --git a/src/hb-gdi.cc b/src/hb-gdi.cc
index 526f1cd..d55085c 100644
--- a/src/hb-gdi.cc
+++ b/src/hb-gdi.cc
@@ -62,7 +62,7 @@
  *
  * Return value: #hb_face_t object corresponding to the given input
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 hb_face_t *
 hb_gdi_face_create (HFONT hfont)
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 5286435..d95e5a0 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -1954,6 +1954,8 @@
  * Fetches a baseline value from the face.
  *
  * Return value: if found baseline value in the the font.
+ *
+ * Since: 2.6.0
  **/
 hb_bool_t
 hb_ot_layout_get_baseline (hb_font_t                   *font,
diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index 61cd157..5124c1e 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -428,7 +428,7 @@
  *
  * Baseline tags from https://docs.microsoft.com/en-us/typography/opentype/spec/baselinetags
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  */
 typedef enum {
   HB_OT_LAYOUT_BASELINE_TAG_ROMAN			= HB_TAG ('r','o','m','n'),
diff --git a/src/hb-ot-meta.cc b/src/hb-ot-meta.cc
index 158bedf..a1e081b 100644
--- a/src/hb-ot-meta.cc
+++ b/src/hb-ot-meta.cc
@@ -46,7 +46,7 @@
  *
  * Return value: Number of all available feature types.
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 unsigned int
 hb_ot_meta_get_entry_tags (hb_face_t        *face,
@@ -66,7 +66,7 @@
  *
  * Returns: (transfer full): A blob containing the blob.
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 hb_blob_t *
 hb_ot_meta_reference_entry (hb_face_t *face, hb_ot_meta_tag_t meta_tag)
diff --git a/src/hb-ot-meta.h b/src/hb-ot-meta.h
index e19be15..0278d84 100644
--- a/src/hb-ot-meta.h
+++ b/src/hb-ot-meta.h
@@ -44,7 +44,7 @@
  *
  * Known metadata tags from https://docs.microsoft.com/en-us/typography/opentype/spec/meta
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 typedef enum {
 /*
diff --git a/src/hb-ot-metrics.cc b/src/hb-ot-metrics.cc
index f04984c..181ac4d 100644
--- a/src/hb-ot-metrics.cc
+++ b/src/hb-ot-metrics.cc
@@ -117,7 +117,7 @@
  * It fetches metrics value corresponding to a given tag from a font.
  *
  * Returns: Whether found the requested metrics in the font.
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 hb_bool_t
 hb_ot_metrics_get_position (hb_font_t           *font,
@@ -189,7 +189,7 @@
  *
  * Returns:
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 float
 hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
@@ -204,7 +204,7 @@
  *
  * Returns:
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 hb_position_t
 hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
@@ -219,7 +219,7 @@
  *
  * Returns:
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 hb_position_t
 hb_ot_metrics_get_y_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
diff --git a/src/hb-ot-metrics.h b/src/hb-ot-metrics.h
index 7f0d773..42c7363 100644
--- a/src/hb-ot-metrics.h
+++ b/src/hb-ot-metrics.h
@@ -68,7 +68,7 @@
  *
  * From https://docs.microsoft.com/en-us/typography/opentype/spec/mvar#value-tags
  *
- * Since: REPLACEME
+ * Since: 2.6.0
  **/
 typedef enum {
   HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER		= HB_TAG ('h','a','s','c'),
diff --git a/src/hb-version.h b/src/hb-version.h
index 251cc63..3f0ccaf 100644
--- a/src/hb-version.h
+++ b/src/hb-version.h
@@ -37,10 +37,10 @@
 
 
 #define HB_VERSION_MAJOR 2
-#define HB_VERSION_MINOR 5
-#define HB_VERSION_MICRO 3
+#define HB_VERSION_MINOR 6
+#define HB_VERSION_MICRO 0
 
-#define HB_VERSION_STRING "2.5.3"
+#define HB_VERSION_STRING "2.6.0"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \