diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.def b/clang/include/clang/Basic/DiagnosticSemaKinds.def
index c02ee6e538ce..f1495a2ef412 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.def
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.def
@@ -962,6 +962,8 @@ DIAG(err_attribute_multiple_objc_gc, ERROR,
      "multiple garbage collection attributes specified for type")
 DIAG(err_catch_param_not_objc_type, ERROR,
      "@catch parameter is not an Objective-C class type")
+DIAG(warn_ignoring_qualifiers_on_catch_parm, WARNING,
+     "ignoring qualifiers on @catch parameter")
 
 
 // C++ casts
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 7e7edbe51ad1..12db43376830 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -968,9 +968,14 @@ Sema::ActOnObjCAtCatchStmt(SourceLocation AtLoc,
   ParmVarDecl *PVD = static_cast<ParmVarDecl*>(Parm);
   
   // PVD == 0 implies @catch(...).
-  if (PVD && !Context.isObjCObjectPointerType(PVD->getType()))
-    return StmtError(Diag(PVD->getLocation(), 
-                          diag::err_catch_param_not_objc_type));
+  if (PVD) {
+    if (!Context.isObjCObjectPointerType(PVD->getType()))
+      return StmtError(Diag(PVD->getLocation(), 
+                       diag::err_catch_param_not_objc_type));
+    if (PVD->getType()->isObjCQualifiedIdType())
+      return StmtError(Diag(PVD->getLocation(), 
+                       diag::warn_ignoring_qualifiers_on_catch_parm));
+  }
     
   ObjCAtCatchStmt *CS = new (Context) ObjCAtCatchStmt(AtLoc, RParen,
     PVD, static_cast<Stmt*>(Body.release()), CatchList);
diff --git a/clang/test/SemaObjC/catch-stmt.m b/clang/test/SemaObjC/catch-stmt.m
index 9aa6e057f4fd..33ad9ddc813f 100644
--- a/clang/test/SemaObjC/catch-stmt.m
+++ b/clang/test/SemaObjC/catch-stmt.m
@@ -1,10 +1,13 @@
 // RUN: clang -verify %s
 
+@protocol P;
+
 void f() {
   @try {
   } @catch (void a) { // expected-error{{@catch parameter is not an Objective-C class type}}
   } @catch (int) { // expected-error{{@catch parameter is not an Objective-C class type}}
   } @catch (int *b) { // expected-error{{@catch parameter is not an Objective-C class type}}
+  } @catch (id <P> c) { // expected-warning{{ignoring qualifiers on @catch parameter}}
   }
 }