diff --git a/ChangeLog b/ChangeLog
index ba99ab2e2..d456f1fca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/efi/init.c (grub_efi_init): Disable watchdog.
+	Tested by: Seth Goldberg.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/multiboot.c (grub_multiboot_boot) [GRUB_USE_MULTIBOOT2]:
diff --git a/kern/efi/init.c b/kern/efi/init.c
index b79084a6a..d8a85eddf 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -36,6 +36,9 @@ grub_efi_init (void)
   /* Initialize the memory management system.  */
   grub_efi_mm_init ();
 
+  efi_call_3 (grub_efi_system_table->boot_services->set_watchdog_timer,
+	      0, 0, 0);
+
   grub_efidisk_init ();
 }