diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 234ec4c..371aba1 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -935,13 +935,24 @@
   if (TUK == Action::TUK_Definition) {
     switch (Tok.getKind()) {
     case tok::semi:               // struct foo {...} ;
-    case tok::star:               // struct foo {...} *       P;
-    case tok::amp:                // struct foo {...} &       R = ...
-    case tok::identifier:         // struct foo {...} V       ;
-    case tok::r_paren:            //(struct foo {...} )       {4}
-    case tok::annot_cxxscope:     // struct foo {...} a::     b;
-    case tok::annot_typename:     // struct foo {...} a       ::b;
-    case tok::annot_template_id:  // struct foo {...} a<int>  ::b;
+    case tok::star:               // struct foo {...} *         P;
+    case tok::amp:                // struct foo {...} &         R = ...
+    case tok::identifier:         // struct foo {...} V         ;
+    case tok::r_paren:            //(struct foo {...} )         {4}
+    case tok::annot_cxxscope:     // struct foo {...} a::       b;
+    case tok::annot_typename:     // struct foo {...} a         ::b;
+    case tok::annot_template_id:  // struct foo {...} a<int>    ::b;
+    // Storage-class specifiers
+    case tok::kw_static:          // struct foo {...} static    x;
+    case tok::kw_extern:          // struct foo {...} extern    x;
+    case tok::kw_typedef:         // struct foo {...} typedef   x;
+    case tok::kw_register:        // struct foo {...} register  x;
+    case tok::kw_auto:            // struct foo {...} auto      x;
+    // Type qualifiers
+    case tok::kw_const:           // struct foo {...} const     x;
+    case tok::kw_volatile:        // struct foo {...} volatile  x;
+    case tok::kw_restrict:        // struct foo {...} restrict  x;
+    case tok::kw_inline:          // struct foo {...} inline    foo() {};
       break;
         
     case tok::r_brace:  // struct bar { struct foo {...} } 
diff --git a/test/Parser/declarators.c b/test/Parser/declarators.c
index 074e2ad..edd68cc 100644
--- a/test/Parser/declarators.c
+++ b/test/Parser/declarators.c
@@ -71,3 +71,7 @@
   int y;
   int z  // expected-warning {{expected ';' at end of declaration list}}
 };
+
+// PR6208
+struct test10 { int a; } static test10x;
+struct test11 { int a; } const test11x;
diff --git a/test/Sema/declspec.c b/test/Sema/declspec.c
index e1f2bf4..d9f4157 100644
--- a/test/Sema/declspec.c
+++ b/test/Sema/declspec.c
@@ -8,8 +8,11 @@
 int typedef validTypeDecl() { } // expected-error {{function definition declared 'typedef'}}
 
 struct _zend_module_entry { }    // expected-error {{expected ';' after struct}}
+int gv1;
 typedef struct _zend_function_entry { } // expected-error {{expected ';' after struct}} \
                                         // expected-error {{declaration does not declare anything}}
+int gv2;
+
 static void buggy(int *x) { }
 
 // Type qualifiers.