diff --git a/ChangeLog b/ChangeLog
index f3e7bce6d..2de844949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-25  Werner Lemberg  <wl@gnu.org>
+
+	* devel/ftoption.h: Synchronize with
+	include/freetype/config/ftoption.h.
+
 2006-02-25  David Turner  <david@freetype.org>
 
 	Fix compiler warnings as well as C++ compilation problems.
diff --git a/devel/ftoption.h b/devel/ftoption.h
index d3f04955d..da3559a5c 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -586,8 +586,13 @@ FT_BEGIN_HEADER
    * certain functions like ft_mem_alloc in a way that prevents recent GCC
    * releases from emitting zillions of `strict aliasing' warning messages
    * each time a memory-management function is called.
+   *
+   * Note that it shouldn't be activated when building the library with
+   * a C++ compiler.
    */
+#ifndef __cplusplus
 #define FT_STRICT_ALIASING
+#endif
 
 
   /*
@@ -595,6 +600,10 @@ FT_BEGIN_HEADER
    * structures that was used prior to FreeType 2.2.  This also compiles in
    * a few obsolete functions to avoid linking problems on typical Unix
    * distributions.
+   *
+   * For embedded systems or building a new distribution from scratch, it
+   * is recommended to disable the macro since it reduces the library's code
+   * size and activates a few memory-saving optimizations as well.
    */
 #undef FT_CONFIG_OPTION_OLD_INTERNALS