diff --git a/CHANGELOG b/CHANGELOG
index b6ba66d09cec2b55e84d055d3a982b7e860d298b..9486f0d3f237dccfc2189544f357d7da721d7873 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix buffer overflow problem in ft_build.c
+  Patch by Fredrik Roubert, 09 Oct 2006
+
 * Make bootp implementation RFC3046 compliant
   Patch by Joakim Larsson, 27 Jun 2006
 
diff --git a/common/ft_build.c b/common/ft_build.c
index 9e9c906fc1f9cb27c0d6078d1967fa1a6e6e1b03..b0560a22a15e2d78a6979e935d4b4b7c9dfd65a1 100644
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -293,7 +293,9 @@ static void print_data(const void *data, int len)
 		return;
 
 	if (is_printable_string(data, len)) {
-		printf(" = \"%s\"", (char *)data);
+		puts(" = \"");
+		puts(data);
+		puts("\"");
 		return;
 	}