diff --git a/ChangeLog b/ChangeLog
index 35ecc7073..24981a5fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/crypto.c (read_crypto_list): Fix a memory leak.
+	* normal/term.c (read_terminal_list): Likewise.
+	* normal/main.c (grub_normal_init_page): Likewise.
+	(grub_normal_read_line_real): Likewise.
+
 2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Fix a
diff --git a/normal/crypto.c b/normal/crypto.c
index 932f26f97..95899fbd5 100644
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -88,6 +88,7 @@ read_crypto_list (void)
     }
 
   file = grub_file_open (filename);
+  grub_free (filename);
   if (!file)
     {
       grub_errno = GRUB_ERR_NONE;
diff --git a/normal/main.c b/normal/main.c
index 9f8c12773..2306427fc 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -418,6 +418,7 @@ grub_normal_init_page (struct grub_term_output *term)
  
   msg_len = grub_utf8_to_ucs4_alloc (msg_formatted,
   				     &unicode_msg, &last_position);
+  grub_free (msg_formatted);
  
   if (msg_len < 0)
     {
@@ -582,10 +583,13 @@ grub_normal_read_line_real (char **line, int cont, int nested)
       if (cont || nested)
 	{
 	  grub_free (*line);
+	  grub_free (prompt);
 	  *line = 0;
 	  return grub_errno;
 	}
     }
+  
+  grub_free (prompt);
 
   return 0;
 }
diff --git a/normal/term.c b/normal/term.c
index 42201fbb3..e31d403ee 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -175,6 +175,7 @@ read_terminal_list (void)
     }
 
   file = grub_file_open (filename);
+  grub_free (filename);
   if (!file)
     {
       grub_errno = GRUB_ERR_NONE;