diff --git a/CHANGELOG b/CHANGELOG
index a2c01fbb38..7c201433ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,14 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Added OF_STDOUT_PATH and OF_SOC
+
+  OF_STDOUT_PATH specifies the path to the device the kernel can use
+  for console output
+
+  OF_SOC specifies the proper name of the SOC node if one exists.
+  Patch by Kumar Gala 11 Jan 2006
+
 * Allow board code to fixup the flat device tree before booting a
   kernel
   Patch by Kumar Gala 11 Jan 2006
diff --git a/README b/README
index 3b64fe20a1..ecaef9e153 100644
--- a/README
+++ b/README
@@ -411,7 +411,9 @@ The following options need to be configured:
 		The maximum size of the constructed OF tree.
 
 		OF_CPU - The proper name of the cpus node.
+		OF_SOC - The proper name of the soc node.
 		OF_TBCLK - The timebase frequency.
+		OF_STDOUT_PATH - The path to the console device
 
 		CONFIG_OF_HAS_BD_T
 
diff --git a/common/ft_build.c b/common/ft_build.c
index 2cecbcf966..7a9a40a305 100644
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -645,6 +645,9 @@ void ft_setup(void *blob, int size, bd_t * bd)
 	ft_prop_str(&cxt, "name", "chosen");
 	ft_prop_str(&cxt, "bootargs", getenv("bootargs"));
 	ft_prop_int(&cxt, "linux,platform", 0x600);	/* what is this? */
+#ifdef OF_STDOUT_PATH
+	ft_prop_str(&cxt, "linux,stdout-path", OF_STDOUT_PATH);
+#endif
 
 	ft_end_node(&cxt);