diff --git a/ChangeLog b/ChangeLog
index 33b0ea3bd..4de8073ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	(grub_arch_modules_addr): Return 0 and not NULL.
 	* util/misc.c (ENABLE_RELOCATABLE): New definition.
 	(xstrdup): USe newstr instead of dup.
+	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
+	of disk to dsk to avoid shadowing.
 
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 5c56b7579..9a3f30ce0 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -981,10 +981,10 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     struct hd_geometry hdg;
     int dos_part = -1;
     int bsd_part = -1;
-    auto int find_partition (grub_disk_t disk,
+    auto int find_partition (grub_disk_t dsk,
 			     const grub_partition_t partition);
 
-    int find_partition (grub_disk_t disk __attribute__ ((unused)),
+    int find_partition (grub_disk_t dsk __attribute__ ((unused)),
 			const grub_partition_t partition)
       {
  	struct grub_msdos_partition *pcdata = NULL;