diff --git a/ChangeLog b/ChangeLog
index af8e5a1ce..03124f648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* src/cid/cidparse.c (cid_parser_new): Don't continue second search
 	pass for `StartData' if an error has occurred.
 
+	* builds/unix/ftsystem.c (FT_Stream_Open): Don't use ULONG_MAX but
+	LONG_MAX to avoid compiler warning.  Suggested by Sean McBride.
+
 2007-05-30  Werner Lemberg  <wl@gnu.org>
 
 	* src/type1/t1load.c (parse_subrs, parse_charstrings): Protect
diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c
index f9d25eb1a..3a740fd02 100644
--- a/builds/unix/ftsystem.c
+++ b/builds/unix/ftsystem.c
@@ -275,7 +275,7 @@
     /* To avoid overflow caused by fonts in huge files larger than     */
     /* 2GB, do a test.  Temporary fix proposed by Sean McBride.        */
     /*                                                                 */
-    if ( stat_buf.st_size > ULONG_MAX )
+    if ( stat_buf.st_size > LONG_MAX )
     {
       FT_ERROR(( "FT_Stream_Open: file is too big" ));
       goto Fail_Map;
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 44ad625c1..bd036f9f1 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -384,7 +384,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Struct>                                                              */
-  /*    FT_Data	                                                           */
+  /*    FT_Data                                                            */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Read-only binary data represented as a pointer and a length.       */