diff --git a/ChangeLog b/ChangeLog
index 8c5e2819e..ff35a16c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-11  Werner Lemberg  <wl@gnu.org>
+
+	[base] Rename `FT_XFREE86_H' to `FT_FONT_FORMATS_H'.
+
+	* include/config/ftheader.h: Implement it.
+	* src/base/ftfntfmt.c, docs/CHANGES: Updated.
+
 2015-03-11  Werner Lemberg  <wl@gnu.org>
 
 	[base] Rename `FT_Get_X11_Font_Format' to `FT_Get_Font_Format'.
diff --git a/docs/CHANGES b/docs/CHANGES
index 17fe4bcb1..2153e3a9d 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -43,6 +43,10 @@ CHANGES BETWEEN 2.5.5 and 2.6
       function.  For backwards compatibility, the old function name is
       still available.
 
+      Additionally, the header  file macro for this  function has been
+      renamed to  `FT_FONT_FORMATS_H' (the old name  `FT_XFREE86_H' is
+      retained for backwards compatibility).
+
 
 ======================================================================
 
diff --git a/include/config/ftheader.h b/include/config/ftheader.h
index 77d9187f2..4906bc1f2 100644
--- a/include/config/ftheader.h
+++ b/include/config/ftheader.h
@@ -710,14 +710,16 @@
   /*************************************************************************
    *
    * @macro:
-   *   FT_XFREE86_H
+   *   FT_FONT_FORMATS_H
    *
    * @description:
    *   A macro used in #include statements to name the file containing the
-   *   FreeType~2 API which provides functions specific to the XFree86 and
-   *   X.Org X11 servers.
+   *   FreeType~2 API which provides functions specific to font formats.
    */
-#define FT_XFREE86_H  <ftfntfmt.h>
+#define FT_FONT_FORMATS_H  <ftfntfmt.h>
+
+  /* deprecated */
+#define FT_XFREE86_H  FT_FONT_FORMATS_H
 
 
   /*************************************************************************
diff --git a/src/base/ftfntfmt.c b/src/base/ftfntfmt.c
index 38a5b6054..7f913d642 100644
--- a/src/base/ftfntfmt.c
+++ b/src/base/ftfntfmt.c
@@ -17,7 +17,7 @@
 
 
 #include <ft2build.h>
-#include FT_XFREE86_H
+#include FT_FONT_FORMATS_H
 #include FT_INTERNAL_OBJECTS_H
 #include FT_SERVICE_XFREE86_NAME_H