diff --git a/NEWS b/NEWS
index 20bb21ba2..cbec26512 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 cebb10adf..95c55c9a0 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 2e4b35cbb..433c20659 100644
--- a/docs/harfbuzz-docs.xml
+++ b/docs/harfbuzz-docs.xml
@@ -133,6 +133,10 @@
API Index
Index of deprecated API
+ Index of new symbols in 2.6.0
+ Index of new symbols in 2.5.0
+ Index of new symbols in 2.4.0
+ Index of new symbols in 2.3.0
Index of new symbols in 2.2.0
Index of new symbols in 2.1.0
Index of new symbols in 2.0.0
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 44953c98b..e6339cdce 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -1890,7 +1890,7 @@ hb_font_set_var_coords_design (hb_font_t *font,
*
* 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 526f1cd9e..d55085cb4 100644
--- a/src/hb-gdi.cc
+++ b/src/hb-gdi.cc
@@ -62,7 +62,7 @@ fail:
*
* 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 52864354e..d95e5a0b1 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -1954,6 +1954,8 @@ hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
* 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 61cd157e6..5124c1e1f 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -428,7 +428,7 @@ hb_ot_layout_feature_get_characters (hb_face_t *face,
*
* 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 158bedf45..a1e081b24 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 @@ hb_ot_meta_get_entry_tags (hb_face_t *face,
*
* 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 e19be1500..0278d8414 100644
--- a/src/hb-ot-meta.h
+++ b/src/hb-ot-meta.h
@@ -44,7 +44,7 @@ HB_BEGIN_DECLS
*
* 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 f04984cca..181ac4d57 100644
--- a/src/hb-ot-metrics.cc
+++ b/src/hb-ot-metrics.cc
@@ -117,7 +117,7 @@ _get_gasp (hb_face_t *face, float *result, hb_ot_metrics_tag_t metrics_tag)
* 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 @@ hb_ot_metrics_get_position (hb_font_t *font,
*
* 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 @@ hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
*
* 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 @@ hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
*
* 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 7f0d773b3..42c7363c0 100644
--- a/src/hb-ot-metrics.h
+++ b/src/hb-ot-metrics.h
@@ -68,7 +68,7 @@ HB_BEGIN_DECLS
*
* 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 251cc6399..3f0ccaf45 100644
--- a/src/hb-version.h
+++ b/src/hb-version.h
@@ -37,10 +37,10 @@ HB_BEGIN_DECLS
#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) <= \