diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 8214ece4b23..82c90d2e571 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -4,12 +4,6 @@
 	* Make-lang.in (GO_OBJS): Add go/go-sha1.o.
 	(CFLAGS-go/go-sha1.o): New variable.
 
-2016-09-01  Martin Sebor  <msebor@redhat.com>
-
-	* gofrontend/expressions.cc: Increase buffer size to guarantee
-	it fits the output of the formatted function regardless of its
-	arguments.
-
 2016-08-29  Ian Lance Taylor  <iant@google.com>
 
 	* lang.opt (fgo-c-header, fgo-compiling-runtime): New options.
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index af731f1610f..3b1f03a1fbe 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2022ddc85f812b6990b72c7e95b8207e07ac8984
+c2bd848dce774e8009ae1d8ee5d91ddc601ce37f
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index 99f9f669407..aabb35391ac 100644
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -9050,8 +9050,7 @@ Call_expression::do_flatten(Gogo* gogo, Named_object*,
       Location loc = this->location();
 
       int i = 0;
-      /* Buffer large enough for INT_MAX plus the prefix.  */
-      char buf[14];
+      char buf[20];
       for (Typed_identifier_list::const_iterator p = results->begin();
            p != results->end();
            ++p, ++i)