diff --git a/ChangeLog b/ChangeLog
index d839afb65..b78bdcce0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-18  Robert Millan  <rmh@gnu.org>
+
+	* grub-core/fs/btrfs.c (grub_btrfs_mount): Replace grub_strncmp()
+	with grub_memcmp().
+
 2010-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/menu_entry.c (print_up): Fix displacement of up
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index a50bae000..a2ee485b4 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -51,7 +51,7 @@ grub_btrfs_mount (grub_disk_t disk)
 		      &data->sblock) != GRUB_ERR_NONE)
     goto fail;
 
-  if (grub_strncmp ((char *) data->sblock.signature, BTRFS_SIGNATURE, sizeof (BTRFS_SIGNATURE) - 1))
+  if (grub_memcmp ((char *) data->sblock.signature, BTRFS_SIGNATURE, sizeof (BTRFS_SIGNATURE) - 1))
     {
       grub_error (GRUB_ERR_BAD_FS, "not a Btrfs filesystem");
       goto fail;