diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml
index 738356b8c..cc6c989a1 100644
--- a/docs/harfbuzz-docs.xml
+++ b/docs/harfbuzz-docs.xml
@@ -56,6 +56,7 @@
         <xi:include href="xml/hb-blob.xml"/>
         <xi:include href="xml/hb-buffer.xml"/>
         <xi:include href="xml/hb-common.xml"/>
+        <xi:include href="xml/hb-features.xml"/>
         <xi:include href="xml/hb-draw.xml"/>
         <xi:include href="xml/hb-paint.xml"/>
         <xi:include href="xml/hb-deprecated.xml"/>
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 930cf5479..254e809b7 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -166,16 +166,6 @@ HB_TAG_MAX_SIGNED
 HB_LANGUAGE_INVALID
 HB_FEATURE_GLOBAL_END
 HB_FEATURE_GLOBAL_START
-HB_HAS_CAIRO
-HB_HAS_CORETEXT
-HB_HAS_DIRECTWRITE
-HB_HAS_FREETYPE
-HB_HAS_GDI
-HB_HAS_GLIB
-HB_HAS_GOBJECT
-HB_HAS_GRAPHITE
-HB_HAS_ICU
-HB_HAS_UNISCRIBE
 <SUBSECTION Private>
 HB_BEGIN_DECLS
 HB_END_DECLS
@@ -194,6 +184,20 @@ HB_DEPRECATED
 HB_DEPRECATED_FOR
 </SECTION>
 
+<SECTION>
+<FILE>hb-features</FILE>
+HB_HAS_CAIRO
+HB_HAS_CORETEXT
+HB_HAS_DIRECTWRITE
+HB_HAS_FREETYPE
+HB_HAS_GDI
+HB_HAS_GLIB
+HB_HAS_GOBJECT
+HB_HAS_GRAPHITE
+HB_HAS_ICU
+HB_HAS_UNISCRIBE
+</SECTION>
+
 <SECTION>
 <FILE>hb-draw</FILE>
 hb_draw_funcs_create
diff --git a/src/hb-features.h.in b/src/hb-features.h.in
index da67f772f..d85749ca9 100644
--- a/src/hb-features.h.in
+++ b/src/hb-features.h.in
@@ -27,6 +27,14 @@
 
 HB_BEGIN_DECLS
 
+/**
+ * SECTION: hb-features
+ * @title: hb-features
+ * @short_description: Feature detection
+ * @include: hb-features.h
+ *
+ * Macros for detecting optional HarfBuzz features at build time.
+ **/
 
 /**
  * HB_HAS_CAIRO: