diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 76baa3c3ac2dcb2194650e70c4af8650619f77ef..ef48f8609bcd892208d5e4bd583b9129fa5ee8f0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-12  Anton Blanchard  <anton@samba.org>
+
+	* cplus-dem.c (demangle_fund_type): Ensure buf is large enough to
+	hold "int%u_t".
+
 2006-04-24  Julian Brown  <julian@codesourcery.com>
 
 	* floatformat.c (floatformat_to_double): Fix (biased) exponent=0 case.
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 8b60434a8882cc22ae0cfa9f0ad2b1d82239f89e..1f8b1fc31e4b8fd5618059c17948c87c7a47c6c8 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -3693,7 +3693,7 @@ demangle_fund_type (struct work_stuff *work,
 {
   int done = 0;
   int success = 1;
-  char buf[10];
+  char buf[INTBUF_SIZE + 5 /* 'int%u_t' */];
   unsigned int dec = 0;
   type_kind_t tk = tk_integral;