diff --git a/ChangeLog b/ChangeLog
index 6da224094..b9dfd7e73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/fat.c (grub_fat_iterate_dir): Free unibuf at exit.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/pc/xnu.c (grub_xnu_set_video): Add const qualifier to
diff --git a/fs/fat.c b/fs/fat.c
index d008dc10d..89050943c 100644
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -592,6 +592,7 @@ grub_fat_iterate_dir (grub_disk_t disk, struct grub_fat_data *data,
     }
 
   grub_free (filename);
+  grub_free (unibuf);
 
   return grub_errno;
 }