diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 230631b..d849186 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -317,7 +317,8 @@
   bool VisitLinkageSpecDecl(LinkageSpecDecl *D);
   bool VisitNamespaceDecl(NamespaceDecl *D);
   bool VisitNamespaceAliasDecl(NamespaceAliasDecl *D);
- 
+  bool VisitUsingDirectiveDecl(UsingDirectiveDecl *D);
+  
   // Name visitor
   bool VisitDeclarationNameInfo(DeclarationNameInfo Name);
   
@@ -871,6 +872,13 @@
                                       D->getTargetNameLoc(), TU));
 }
 
+bool CursorVisitor::VisitUsingDirectiveDecl(UsingDirectiveDecl *D) {
+  // FIXME: Visit nested-name-specifier
+
+  return Visit(MakeCursorNamespaceRef(D->getNominatedNamespaceAsWritten(),
+                                      D->getIdentLocation(), TU));
+}
+
 bool CursorVisitor::VisitDeclarationNameInfo(DeclarationNameInfo Name) {
   switch (Name.getName().getNameKind()) {
   case clang::DeclarationName::Identifier:
@@ -2022,6 +2030,9 @@
     // ObjCCategoryImplDecl returns the category name.
     return createCXString(CIMP->getIdentifier()->getNameStart());
 
+  if (isa<UsingDirectiveDecl>(D))
+    return createCXString("");
+  
   llvm::SmallString<1024> S;
   llvm::raw_svector_ostream os(S);
   ND->printName(os);
@@ -2219,6 +2230,8 @@
     return createCXString("ClassTemplatePartialSpecialization");
   case CXCursor_NamespaceAlias:
     return createCXString("NamespaceAlias");
+  case CXCursor_UsingDirective:
+    return createCXString("UsingDirective");
   }
 
   llvm_unreachable("Unhandled CXCursorKind");