diff --git a/ChangeLog b/ChangeLog
index 19603ad9e..d7f91bb4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-21  Felix Zielcke  <fzielcke@z-51.de>
+
+	* fs/ntfs.c (grub_ntfs_mount): Fix a memory leak.
+
 2008-08-21  Robert Millan  <rmh@aybabtu.com>
 
 	* loader/i386/linux.c: New file.  Implements generic 32-bit Linux
diff --git a/fs/ntfs.c b/fs/ntfs.c
index 3363eb02b..3174ab181 100644
--- a/fs/ntfs.c
+++ b/fs/ntfs.c
@@ -850,6 +850,7 @@ fail:
     {
       free_file (&data->mmft);
       free_file (&data->cmft);
+      grub_free (data);
     }
   return 0;
 }