diff --git a/ChangeLog b/ChangeLog
index ee2cf4079..04e84a415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/udf.c (grub_udf_iterate_dir): Silence a spurious warning.
+
 2010-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/udf.c (grub_udf_iterate_dir): Decode the Unicode filenames.
diff --git a/fs/udf.c b/fs/udf.c
index 725468f54..ad109bed9 100644
--- a/fs/udf.c
+++ b/fs/udf.c
@@ -749,7 +749,7 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
 	  grub_uint8_t raw[dirent.file_ident_length];
 	  grub_uint16_t utf16[dirent.file_ident_length - 1];
 	  grub_uint8_t filename[dirent.file_ident_length * 2];
-	  grub_size_t utf16len;
+	  grub_size_t utf16len = 0;
 
 	  type = ((dirent.characteristics & GRUB_UDF_FID_CHAR_DIRECTORY) ?
 		  (GRUB_FSHELP_DIR) : (GRUB_FSHELP_REG));