diff --git a/CHANGELOG b/CHANGELOG
index 382bfbd0b..9a1800001 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Add passing of the command line and memory size information to  the
+  kernel on xaeniax board.
+
 * Enable NAND flash support for NC650 board.
 
 * Patch by Thomas Lange 07 Oct 2004:
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 0ae26c24f..a7b695dda 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -82,7 +82,9 @@
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTCOMMAND	"bootm 0x00100000"
 #define CONFIG_BOOTARGS		"console=ttyS1,115200"
-#define CONFIG_CMDLINE_TAG1				/* enable passing of ATAGs */
+#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS 	1
+#define CONFIG_INITRD_TAG		1
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200			/* speed to run kgdb serial port */