diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b59e0f9029c..3f1b1a7909b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-08  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c/16999
+	* c-ppoutput.c (cb_ident): Don't quote string as it is already
+	quoted.
+
 2004-10-08  Diego Novillo  <dnovillo@redhat.com>
 
 	* tree-ssa-pre.c (init_pre): Use size of ARRAY_REF to allocate
diff --git a/gcc/c-ppoutput.c b/gcc/c-ppoutput.c
index 95563995e7c2..64b27a75f621 100644
--- a/gcc/c-ppoutput.c
+++ b/gcc/c-ppoutput.c
@@ -304,7 +304,7 @@ cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, source_location line,
 	  const cpp_string *str)
 {
   maybe_print_line (line);
-  fprintf (print.outf, "#ident \"%s\"\n", str->text);
+  fprintf (print.outf, "#ident %s\n", str->text);
   print.src_line++;
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d16487d2e0da..bf8231b73574 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-08  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c/16999
+	* gcc.dg/cpp/ident-1.c: New test.
+
 2004-10-08  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* gcc.c-torture/compile/acc1.c: New.
diff --git a/gcc/testsuite/gcc.dg/cpp/ident-1.c b/gcc/testsuite/gcc.dg/cpp/ident-1.c
new file mode 100644
index 000000000000..5437296ddd1a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/ident-1.c
@@ -0,0 +1,7 @@
+/* { dg-do preprocess } */
+
+/* Based on PR 16999 */
+
+#ident "this is an ident"
+
+/* { dg-final { scan-file "ident-1.i" "(^|\\n)#ident \"this is an ident\"($|\\n)" } } */