diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
index e444d75bc6a..87e6871eb5d 100644
--- a/include/llvm/Intrinsics.td
+++ b/include/llvm/Intrinsics.td
@@ -232,7 +232,7 @@ def int_dbg_declare      : Intrinsic<[llvm_void_ty, llvm_descriptor_ty,
 //===------------------ Exception Handling Intrinsics----------------------===//
 //
 def int_eh_exception : Intrinsic<[llvm_ptr_ty]>;
-def int_eh_handlers  : Intrinsic<[llvm_i32_ty, llvm_ptr_ty, llvm_ptr_ty,
+def int_eh_selector  : Intrinsic<[llvm_i32_ty, llvm_ptr_ty, llvm_ptr_ty,
                                                llvm_vararg_ty]>;
 def int_eh_typeid_for : Intrinsic<[llvm_i32_ty, llvm_ptr_ty]>;
 
diff --git a/lib/CodeGen/IntrinsicLowering.cpp b/lib/CodeGen/IntrinsicLowering.cpp
index e75291dffa4..09709fedaed 100644
--- a/lib/CodeGen/IntrinsicLowering.cpp
+++ b/lib/CodeGen/IntrinsicLowering.cpp
@@ -357,7 +357,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
   case Intrinsic::dbg_func_start:
   case Intrinsic::dbg_declare:
   case Intrinsic::eh_exception:
-  case Intrinsic::eh_handlers:
+  case Intrinsic::eh_selector:
     break;    // Simply strip out debugging and eh intrinsics
 
   case Intrinsic::memcpy_i32: