diff --git a/test/Index/index-suppress-refs.h b/test/Index/index-suppress-refs.h
index 2592f0f..03c5624 100644
--- a/test/Index/index-suppress-refs.h
+++ b/test/Index/index-suppress-refs.h
@@ -1,3 +1,9 @@
 
 @interface I
 @end
+
+@interface B
+@end
+
+@protocol P
+@end
diff --git a/test/Index/index-suppress-refs.m b/test/Index/index-suppress-refs.m
index 49abf50..46420ee 100644
--- a/test/Index/index-suppress-refs.m
+++ b/test/Index/index-suppress-refs.m
@@ -14,9 +14,17 @@
 
 @class I;
 
+@interface S : B<P>
+-(void)meth:(B*)b :(id<P>)p;
+@end
+
 // RUN: env CINDEXTEST_SUPPRESSREFS=1 c-index-test -index-file %s | FileCheck %s
 // CHECK:      [indexDeclaration]: kind: objc-class | name: I
 // CHECK-NEXT:      <ObjCContainerInfo>: kind: interface
+// CHECK-NEXT: [indexDeclaration]: kind: objc-class | name: B
+// CHECK-NEXT:      <ObjCContainerInfo>: kind: interface
+// CHECK-NEXT: [indexDeclaration]: kind: objc-protocol | name: P
+// CHECK-NEXT:      <ObjCContainerInfo>: kind: interface
 // CHECK-NEXT: [indexDeclaration]: kind: typedef | name: MyInt
 // CHECK-NEXT: [indexDeclaration]: kind: variable | name: gx
 // CHECK-NEXT: [indexDeclaration]: kind: objc-class | name: I
@@ -27,3 +35,10 @@
 // CHECK-NEXT: [indexDeclaration]: kind: objc-instance-method | name: meth
 // CHECK-NOT:  [indexEntityReference]: kind: objc-class | name: I
 // CHECK-NOT:  [indexDeclaration]: kind: objc-class | name: I
+// CHECK-NEXT: [indexDeclaration]: kind: objc-class | name: S
+// CHECK-NEXT:      <ObjCContainerInfo>: kind: interface
+// CHECK-NEXT:      <base>: kind: objc-class | name: B
+// CHECK-NEXT:      <protocol>: kind: objc-protocol | name: P
+// CHECK-NEXT: [indexDeclaration]: kind: objc-instance-method | name: meth::
+// CHECK-NOT:  [indexEntityReference]: kind: objc-class | name: B
+// CHECK-NOT:  [indexEntityReference]: kind: objc-protocol | name: P
\ No newline at end of file
diff --git a/tools/libclang/IndexingContext.cpp b/tools/libclang/IndexingContext.cpp
index a2480ba..8d27d85 100644
--- a/tools/libclang/IndexingContext.cpp
+++ b/tools/libclang/IndexingContext.cpp
@@ -34,6 +34,9 @@
                                 MakeCursorObjCProtocolRef(PD, Loc, IdxCtx.CXTU),
                                 IdxCtx.getIndexLoc(Loc) };
     ProtInfos.push_back(ProtInfo);
+
+    if (IdxCtx.suppressRefs())
+      IdxCtx.markEntityOccurrenceInFile(PD, Loc);
   }
 
   for (unsigned i = 0, e = ProtInfos.size(); i != e; ++i)
@@ -328,6 +331,9 @@
     BaseClass.base = &BaseEntity;
     BaseClass.cursor = MakeCursorObjCSuperClassRef(SuperD, SuperLoc, CXTU);
     BaseClass.loc = getIndexLoc(SuperLoc);
+
+    if (suppressRefs())
+      markEntityOccurrenceInFile(SuperD, SuperLoc);
   }
   
   ObjCProtocolListInfo ProtInfo(D->getReferencedProtocols(), *this, SA);