diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index acaf2f1..11e2ec2 100644
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -19,7 +19,7 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 using namespace clang;
 using namespace CodeGen;
 
@@ -536,7 +536,7 @@
     break;
 
   case ABIArgInfo::StructRet:
-    PAL.push_back(llvm::ParamAttrsWithIndex::get(Index, 
+    PAL.push_back(llvm::FnAttributeWithIndex::get(Index, 
                                                  llvm::ParamAttr::StructRet|
                                                  llvm::ParamAttr::NoAlias));
     ++Index;
@@ -551,7 +551,7 @@
   }
 
   if (FuncAttrs)
-    PAL.push_back(llvm::ParamAttrsWithIndex::get(0, FuncAttrs));
+    PAL.push_back(llvm::FnAttributeWithIndex::get(0, FuncAttrs));
   for (++begin; begin != end; ++begin) {
     QualType ParamType = *begin;
     unsigned ParamAttrs = 0;
@@ -589,7 +589,7 @@
     }
       
     if (ParamAttrs)
-      PAL.push_back(llvm::ParamAttrsWithIndex::get(Index, ParamAttrs));
+      PAL.push_back(llvm::FnAttributeWithIndex::get(Index, ParamAttrs));
     ++Index;
   }
 }
diff --git a/lib/CodeGen/CGCall.h b/lib/CodeGen/CGCall.h
index ffb9baa..53e20ba 100644
--- a/lib/CodeGen/CGCall.h
+++ b/lib/CodeGen/CGCall.h
@@ -21,7 +21,7 @@
 
 namespace llvm {
   class Function;
-  struct ParamAttrsWithIndex;
+  struct FnAttributeWithIndex;
   class Value;
 
   template<typename T, unsigned> class SmallVector;
@@ -35,7 +35,7 @@
   class VarDecl;
 
 namespace CodeGen {
-  typedef llvm::SmallVector<llvm::ParamAttrsWithIndex, 8> ParamAttrListType;
+  typedef llvm::SmallVector<llvm::FnAttributeWithIndex, 8> ParamAttrListType;
 
   /// CallArgList - Type for representing both the value and type of
   /// arguments in a call.