diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1e2c29e682..45b99e067a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-29  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	PR other/69006
+	* config/s390/s390-c.c (s390_resolve_overloaded_builtin): Remove
+	trailing blank line from error message.
+
 2016-01-29  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR c++/69462
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index 14d030d217c..2b6e405dcbf 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -909,7 +909,7 @@ s390_resolve_overloaded_builtin (location_t loc,
     }
   else if (num_matches > 1)
     {
-      error_at (loc, "ambiguous overload for intrinsic: %s\n",
+      error_at (loc, "ambiguous overload for intrinsic: %s",
 	     IDENTIFIER_POINTER (DECL_NAME (ob_fndecl)));
       return error_mark_node;
     }