diff --git a/ChangeLog b/ChangeLog
index 1faaea88b..b4438a7be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Make
+	tpart non-const, so that we can assign to it.  (Since this is a
+	typedef, the constness refers to the pointer rather than what it
+	points to.)
+
 2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* conf/Makefile.common (CPPFLAGS_GNULIB): Add
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index 293467a68..08094fa5c 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -727,7 +727,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
     {
       /* This is a hard disk partition.  */
       grub_disk_t parent = 0;
-      const grub_partition_t tpart = NULL;
+      grub_partition_t tpart = NULL;
       char *device_name;
       grub_efi_device_path_t *dup_dp, *dup_ldp;
       grub_efi_hard_drive_device_path_t hd;