diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index 003554f..91e77b9 100644
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -1350,6 +1350,20 @@
              ParmII->getName());
         ParmII = 0;
       }
+
+      // If no parameter was specified, verify that *something* was specified,
+      // otherwise we have a missing type and identifier.
+      if (!DS.hasTypeSpecifier()) {
+        if (ParmII)
+          Diag(ParmDecl.getIdentifierLoc(),
+               diag::err_param_requires_type_specifier, ParmII->getName());
+        else
+          Diag(Tok.getLocation(), diag::err_anon_param_requires_type_specifier);
+          
+        // Default the parameter to 'int'.
+        const char *PrevSpec = 0;
+        DS.SetTypeSpecType(DeclSpec::TST_int, Tok.getLocation(), PrevSpec);
+      }
         
       ParamInfo.push_back(DeclaratorChunk::ParamInfo(ParmII, 
         ParmDecl.getIdentifierLoc(), ParamTy.Val, ParmDecl.getInvalidType(),
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 78f6c61..02d3159 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -542,6 +542,11 @@
      "variable length arrays are a C99 feature, accepted as an extension")
 DIAG(err_invalid_storage_class_in_func_decl, ERROR,
      "invalid storage class specifier in function declarator")
+DIAG(err_anon_param_requires_type_specifier, ERROR,
+     "type specifier required for unnamed parameter")
+DIAG(err_param_requires_type_specifier, ERROR,
+     "type specifier required for parameter '%0'")
+
 DIAG(err_invalid_reference_qualifier_application, ERROR,
      "'%0' qualifier may not be applied to a reference")
 DIAG(err_declarator_need_ident, ERROR,
diff --git a/test/Parser/declarators.c b/test/Parser/declarators.c
index 91cd816..e00035c 100644
--- a/test/Parser/declarators.c
+++ b/test/Parser/declarators.c
@@ -6,7 +6,7 @@
 void f1(int [*]);
 void f2(int [const *]);
 void f3(int [volatile const*]);
-int f4(*XX)(void); /* expected-error {{cannot return}} */
+int f4(*XX)(void); /* expected-error {{cannot return}} expected-error {{type specifier required}} */
 
 char ((((*X))));