diff --git a/ChangeLog b/ChangeLog
index 634e8aad0..3b7ccab32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* term/i386/pc/at_keyboard.c
+	(keyboard_controller_wait_untill_ready): Rename to ...
+	(keyboard_controller_wait_until_ready): ... this. Update all users.
+
 2010-01-01  Carles Pina i Estany  <carles@pina.cat>
 
 	* commands/help.c: Include `grub/mm.h' and `grub/normal.h'.
diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index 4ad60c65c..6382c954a 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -72,7 +72,7 @@ static char keyboard_map_shift[128] =
 static grub_uint8_t grub_keyboard_controller_orig;
 
 static void
-keyboard_controller_wait_untill_ready (void)
+keyboard_controller_wait_until_ready (void)
 {
   while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)));
 }
@@ -80,7 +80,7 @@ keyboard_controller_wait_untill_ready (void)
 static void
 grub_keyboard_controller_write (grub_uint8_t c)
 {
-  keyboard_controller_wait_untill_ready ();
+  keyboard_controller_wait_until_ready ();
   grub_outb (KEYBOARD_COMMAND_WRITE, KEYBOARD_REG_STATUS);
   grub_outb (c, KEYBOARD_REG_DATA);
 }
@@ -88,7 +88,7 @@ grub_keyboard_controller_write (grub_uint8_t c)
 static grub_uint8_t
 grub_keyboard_controller_read (void)
 {
-  keyboard_controller_wait_untill_ready ();
+  keyboard_controller_wait_until_ready ();
   grub_outb (KEYBOARD_COMMAND_READ, KEYBOARD_REG_STATUS);
   return grub_inb (KEYBOARD_REG_DATA);
 }
@@ -96,9 +96,9 @@ grub_keyboard_controller_read (void)
 static void
 keyboard_controller_led (grub_uint8_t leds)
 {
-  keyboard_controller_wait_untill_ready ();
+  keyboard_controller_wait_until_ready ();
   grub_outb (0xed, KEYBOARD_REG_DATA);
-  keyboard_controller_wait_untill_ready ();
+  keyboard_controller_wait_until_ready ();
   grub_outb (leds & 0x7, KEYBOARD_REG_DATA);
 }