diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b31a43c2f1a5..07e4c0794cd0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-14  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* gcc.dg/cpp/error-1.c: New test.
+
 2004-10-14  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	* gcc.dg/c99-tag-3.c, gcc.dg/declspec-14.c: New tests.
diff --git a/gcc/testsuite/gcc.dg/cpp/error-1.c b/gcc/testsuite/gcc.dg/cpp/error-1.c
new file mode 100644
index 000000000000..961ef6dc3dfc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/error-1.c
@@ -0,0 +1,5 @@
+/* Test that error messages include "error:" in the text.  */
+/* Origin: Joseph Myers <jsm@polyomino.org.uk> */
+/* { dg-do preprocess } */
+
+/* { dg-error "error: unterminated comment" }
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 34daa7c99b74..77f1dc08b80f 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-14  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* errors.c (_cpp_begin_message): Print "error: " for errors.
+
 2004-10-10  Andreas Jaeger  <aj@suse.de>
 
 	* makedepend.c: Include mkdeps.h for prototype of deps_add_vpath.
diff --git a/libcpp/errors.c b/libcpp/errors.c
index 5d53c21b28d2..2aa814016a18 100644
--- a/libcpp/errors.c
+++ b/libcpp/errors.c
@@ -118,6 +118,8 @@ _cpp_begin_message (cpp_reader *pfile, int code,
     fputs (_("warning: "), stderr);
   else if (level == CPP_DL_ICE)
     fputs (_("internal error: "), stderr);
+  else
+    fputs (_("error: "), stderr);
 
   return 1;
 }