diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
index 646a29658a5..8baba365940 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
@@ -1998,7 +1998,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
         if (LT(1) != IToken.tEOC)
         	stmt= statement();
     
-        if (stmt instanceof IASTCaseStatement == false) 
+        if (!(stmt instanceof IASTCaseStatement) && !(stmt instanceof IASTDefaultStatement)) 
         	return stmt;
         
         // bug 105334, switch without compound statement
@@ -2006,7 +2006,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
         ((ASTNode) comp).setOffsetAndLength((ASTNode) stmt);
         comp.addStatement(stmt);
 
-        while (LT(1) != IToken.tEOC && stmt instanceof IASTCaseStatement) {
+        while (LT(1) != IToken.tEOC && (stmt instanceof IASTCaseStatement || stmt instanceof IASTDefaultStatement)) {
         	stmt= statement();
         	comp.addStatement(stmt);
         }