diff --git a/core/org.eclipse.cdt.core.tests/resources/rewrite/ASTWriterDeclSpecTestSource.awts b/core/org.eclipse.cdt.core.tests/resources/rewrite/ASTWriterDeclSpecTestSource.awts
index 98c69d124d7..e7ade0730ce 100644
--- a/core/org.eclipse.cdt.core.tests/resources/rewrite/ASTWriterDeclSpecTestSource.awts
+++ b/core/org.eclipse.cdt.core.tests/resources/rewrite/ASTWriterDeclSpecTestSource.awts
@@ -162,3 +162,11 @@ wchar_t wc;
 //%CPP
 mutable int n;
 
+//!C++0x auto keyword Bug 318588
+//%CPP
+auto var = 42;
+
+//!C++0x long long keyword Bug 318588
+//%CPP
+long long int i;
+
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/DeclSpecWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/DeclSpecWriter.java
index 26e1c613d5d..ae153898e69 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/DeclSpecWriter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/DeclSpecWriter.java
@@ -121,6 +121,10 @@ public class DeclSpecWriter extends NodeWriter {
 			if (isCpp)
 				return Keywords.CHAR32_T;
 			break;
+		case IASTSimpleDeclSpecifier.t_auto:
+			if (isCpp)
+				return Keywords.AUTO;
+			break;
 		}
 
 		System.err.println("Unknow Specifiertype: " + type); //$NON-NLS-1$
@@ -383,12 +387,11 @@ public class DeclSpecWriter extends NodeWriter {
 			scribe.printStringSpace(SHORT);
 		}else if(simpDeclSpec.isLong()) {
 			scribe.printStringSpace(LONG);
+		}else if(simpDeclSpec.isLongLong()) {			
+			scribe.print(LONG_LONG);
 		}
 		if (simpDeclSpec instanceof ICASTSimpleDeclSpecifier) {
 			ICASTSimpleDeclSpecifier cSimpDeclSpec = (ICASTSimpleDeclSpecifier) simpDeclSpec;
-			if (cSimpDeclSpec.isLongLong()) {
-				scribe.print(LONG_LONG);
-			}
 			if (cSimpDeclSpec.isComplex()) {
 				scribe.print(_COMPLEX);
 			}