diff --git a/NEWS b/NEWS
index 2329b08c..f871c4d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
-$Id: NEWS,v 1.113 2007/12/28 02:11:01 rocky Exp $
+$Id: NEWS,v 1.114 2008/01/05 12:12:52 rocky Exp $
 
 version 0.80
 - Add get_media_changed for FreeBSD
+- Savannah bug #21910
 
 version 0.79
 2007-10-27
@@ -390,4 +391,4 @@ version 0.1
 
   Routines split off from VCDImager.
 
-$Id: NEWS,v 1.113 2007/12/28 02:11:01 rocky Exp $
+$Id: NEWS,v 1.114 2008/01/05 12:12:52 rocky Exp $
diff --git a/include/cdio/iso9660.h b/include/cdio/iso9660.h
index 74544893..dd5cb5ee 100644
--- a/include/cdio/iso9660.h
+++ b/include/cdio/iso9660.h
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660.h,v 1.96 2007/08/11 16:26:14 rocky Exp $
+    $Id: iso9660.h,v 1.97 2008/01/05 12:12:52 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004, 2005, 2006, 2007 Rocky Bernstein <rocky@gnu.org>
@@ -963,7 +963,8 @@ lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
   /*!
     Return the directory name stored in the iso9660_dir_t
     
-    A string is allocated: the caller must deallocate.
+    A string is allocated: the caller must deallocate. This routine
+    can return NULL if memory allocation fails.
   */
   char * iso9660_dir_to_name (const iso9660_dir_t *p_iso9660_dir);
   
diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index dc65fd5f..a80c40a9 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660_fs.c,v 1.44 2008/01/05 09:54:31 rocky Exp $
+    $Id: iso9660_fs.c,v 1.45 2008/01/05 12:12:52 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004, 2005, 2006, 2007 Rocky Bernstein <rocky@gnu.org>
@@ -50,7 +50,7 @@
 
 #include <stdio.h>
 
-static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.44 2008/01/05 09:54:31 rocky Exp $";
+static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.45 2008/01/05 12:12:52 rocky Exp $";
 
 /* Implementation of iso9660_t type */
 struct _iso9660_s {
@@ -853,7 +853,8 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
 /*!
   Return the directory name stored in the iso9660_dir_t
 
-  A string is allocated: the caller must deallocate.
+  A string is allocated: the caller must deallocate. This routine
+  can return NULL if memory allocation fails.
  */
 char *
 iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir)