diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index 9eb9b3269..73eeedafe 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -24,6 +24,7 @@
     <xi:include href="xml/cairo-font-options.xml"/>
     <xi:include href="xml/cairo-ft.xml"/>
     <xi:include href="xml/cairo-win32-fonts.xml"/>
+    <xi:include href="xml/cairo-quartz-fonts.xml"/>
   </chapter>
   <chapter id="Surfaces">
     <title>Surfaces</title>
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index 8abd2c68d..98cc97412 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -23,6 +23,14 @@ cairo_win32_scaled_font_get_logical_to_device
 cairo_win32_scaled_font_get_device_to_logical
 </SECTION>
 
+<SECTION>
+<FILE>cairo-quartz-fonts</FILE>
+<TITLE>Quartz Fonts</TITLE>
+CAIRO_HAS_QUARTZ_FONT
+cairo_quartz_font_face_create_for_cgfont
+cairo_quartz_font_face_create_for_atsu_font_id
+</SECTION>
+
 <SECTION>
 <FILE>cairo-image</FILE>
 <TITLE>Image Surfaces</TITLE>
@@ -95,6 +103,12 @@ CAIRO_HAS_QUARTZ_SURFACE
 cairo_quartz_surface_create
 cairo_quartz_surface_create_for_cg_context
 cairo_quartz_surface_get_cg_context
+</SECTION>
+
+<SECTION>
+<FILE>cairo-quartz-image</FILE>
+<TITLE>Quartz Image Surfaces</TITLE>
+CAIRO_HAS_QUARTZ_IMAGE_SURFACE
 cairo_quartz_image_surface_create
 cairo_quartz_image_surface_get_image
 </SECTION>
diff --git a/doc/public/tmpl/cairo-quartz-fonts.sgml b/doc/public/tmpl/cairo-quartz-fonts.sgml
new file mode 100644
index 000000000..28facca60
--- /dev/null
+++ b/doc/public/tmpl/cairo-quartz-fonts.sgml
@@ -0,0 +1,23 @@
+<!-- ##### SECTION Title ##### -->
+Quartz (CGFont) Fonts
+
+<!-- ##### SECTION Short_Description ##### -->
+Font support via CGFont on OS X
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+The Quartz font backend is primarily used to render text on Apple
+MacOS X systems.  The CGFont API is used for the internal
+implementation of the font backend methods.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+<itemizedlist>
+<listitem>#cairo_font_face_t</listitem>
+</itemizedlist>
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+