diff --git a/ChangeLog b/ChangeLog
index 0b65e89c4..f8230130c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-04  harry@kdevelop.org
+
+	* builds/unix/ftsystem.c (FT_Stream_Open): Handle return value 0 of
+	mmap (which might happen on some RTOS).  From Savannah patch #5909.
+
 2007-05-03  Werner Lemberg  <wl@gnu.org>
 
 	* src/base/ftobjs.c (FT_Set_Char_Size): Simplify code.
diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c
index 09dc5b697..f9d25eb1a 100644
--- a/builds/unix/ftsystem.c
+++ b/builds/unix/ftsystem.c
@@ -291,7 +291,8 @@
                                           file,
                                           0 );
 
-    if ( (long)stream->base != -1 )
+    /* on some RTOS, mmap might return 0 */
+    if ( (long)stream->base != -1 && stream->base != NULL )
       stream->close = ft_close_stream_by_munmap;
     else
     {