diff --git a/CHANGELOG b/CHANGELOG
index 006cfac71fe97b024990bc768b38e6b76bbb9889..4272844d47bca6ffca047136033db0656279710f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Enable autoboot for M5271EVB board.
+
 * Changed default ramdisk addr in yosemite/yellowstone ports
   Patch by Stefan Roese, 15 May 2006
 
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 3935f56aa3027db243b064413cde0fb98bd4391c..f0fc013434143eb9075bcc5e419a349a3b458c06 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -50,6 +50,8 @@
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
+#define CONFIG_BOOTDELAY	5
+
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */