diff --git a/ChangeLog b/ChangeLog
index ff6a8c6fd..fa1dd641c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* normal/dyncmd.c (read_command_list): Replace `0' with `NULL'.
+	* normal/handler.c (read_handler_list): Likewise.
+
 2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Misc cleanup.
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index 84b7ff3b1..dc530b07b 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -83,7 +83,7 @@ read_command_list (void)
 	  file = grub_file_open (filename);
 	  if (file)
 	    {
-	      char *buf = 0;
+	      char *buf = NULL;
 	      for (;; grub_free (buf))
 		{
 		  char *p, *name, *modname;
diff --git a/normal/handler.c b/normal/handler.c
index 5e9f8612c..eb19f912f 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -181,7 +181,7 @@ read_handler_list (void)
 	  file = grub_file_open (filename);
 	  if (file)
 	    {
-	      char *buf = 0;
+	      char *buf = NULL;
 	      for (;; grub_free (buf))
 		{
 		  char *p;