diff --git a/cogl-pango/cogl-pango-fontmap.c b/cogl-pango/cogl-pango-fontmap.c
index 722223895..a9c7df065 100644
--- a/cogl-pango/cogl-pango-fontmap.c
+++ b/cogl-pango/cogl-pango-fontmap.c
@@ -98,9 +98,13 @@ cogl_pango_font_map_create_context (CoglPangoFontMap *fm)
 {
   _COGL_RETURN_VAL_IF_FAIL (COGL_PANGO_IS_FONT_MAP (fm), NULL);
 
+#if PANGO_VERSION_CHECK (1, 22, 0)
   /* We can just directly use the pango context from the Cairo font
      map */
+  return pango_font_map_create_context (PANGO_FONT_MAP (fm));
+#else
   return pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fm));
+#endif
 }
 
 static CoglPangoFontMapPriv *