diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47d23b2..1a44c0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,7 @@ if (DEFAULT_ENABLE_LLVM)
 		set(DEFAULT_ENABLE_LLVM FALSE)
 		message(STATUS "svn version of LLVM found.")
 		message(STATUS "Disabling LLVM options unless explicitly enabled.")
-	elseif (LLVM_VER VERSION_GREATER 3.2)
+	elseif (LLVM_VER VERSION_GREATER 3.3)
 		set(DEFAULT_ENABLE_LLVM FALSE)
 		message(STATUS "Untested version of LLVM (${LLVM_VER}) found.")
 		message(STATUS "Disabling LLVM options unless explicitly enabled.")
diff --git a/opts/ClassIMPCache.cpp b/opts/ClassIMPCache.cpp
index 5f420d8..65968a2 100644
--- a/opts/ClassIMPCache.cpp
+++ b/opts/ClassIMPCache.cpp
@@ -14,7 +14,7 @@ namespace
 {
   class ClassIMPCachePass : public ModulePass 
   {
-    LLVMIntegerType *IntTy;
+    LLVMIntegerTy *IntTy;
 
     public:
     static char ID;
diff --git a/opts/IMPCacher.h b/opts/IMPCacher.h
index 28fd500..4991976 100644
--- a/opts/IMPCacher.h
+++ b/opts/IMPCacher.h
@@ -25,9 +25,9 @@ namespace GNUstep
       MDNode *AlreadyCachedFlag;
       unsigned IMPCacheFlagKind;
       Pass *Owner;
-      LLVMPointerType *PtrTy;
-      LLVMPointerType *IdTy;
-      LLVMIntegerType *IntTy;
+      LLVMPointerTy *PtrTy;
+      LLVMPointerTy *IdTy;
+      LLVMIntegerTy *IntTy;
     public:
       IMPCacher(LLVMContext &C, Pass *owner);
       void CacheLookup(Instruction *lookup, Value *slot, Value *version, bool
diff --git a/opts/LLVMCompat.h b/opts/LLVMCompat.h
index 2a37344..d59373e 100644
--- a/opts/LLVMCompat.h
+++ b/opts/LLVMCompat.h
@@ -157,16 +157,16 @@ llvm::Constant* GetConstantStruct(llvm::LLVMContext &C, const std::vector<llvm::
 
 #if LLVM_MAJOR < 3
 typedef const llvm::Type LLVMType;
-typedef const llvm::StructType LLVMStructType;
-typedef const llvm::ArrayType LLVMArrayType;
-typedef const llvm::PointerType LLVMPointerType;
-typedef const llvm::IntegerType LLVMIntegerType;
+typedef const llvm::StructType LLVMStructTy;
+typedef const llvm::ArrayType LLVMArrayTy;
+typedef const llvm::PointerType LLVMPointerTy;
+typedef const llvm::IntegerType LLVMIntegerTy;
 #else
 typedef llvm::Type LLVMType;
-typedef llvm::StructType LLVMStructType;
-typedef llvm::ArrayType LLVMArrayType;
-typedef llvm::PointerType LLVMPointerType;
-typedef llvm::IntegerType LLVMIntegerType;
+typedef llvm::StructType LLVMStructTy;
+typedef llvm::ArrayType LLVMArrayTy;
+typedef llvm::PointerType LLVMPointerTy;
+typedef llvm::IntegerType LLVMIntegerTy;
 #endif
 
 #endif
diff --git a/opts/LoopIMPCachePass.cpp b/opts/LoopIMPCachePass.cpp
index 317a04c..f57e761 100644
--- a/opts/LoopIMPCachePass.cpp
+++ b/opts/LoopIMPCachePass.cpp
@@ -14,7 +14,7 @@ namespace
   class GNULoopIMPCachePass : public FunctionPass 
   {
     GNUstep::IMPCacher *cacher;
-    LLVMIntegerType *IntTy;
+    LLVMIntegerTy *IntTy;
     Module *M;
     bool skip;
     Function *sendFn;
diff --git a/opts/TypeFeedback.cpp b/opts/TypeFeedback.cpp
index e2988a0..bf9edaf 100644
--- a/opts/TypeFeedback.cpp
+++ b/opts/TypeFeedback.cpp
@@ -12,7 +12,7 @@ namespace {
     typedef std::vector<callPair > replacementVector;
       static char ID;
     uint32_t callsiteCount;
-    LLVMIntegerType *Int32Ty;
+    LLVMIntegerTy *Int32Ty;
       GNUObjCTypeFeedback() : ModulePass(ID), callsiteCount(0) {}
 
     void profileFunction(Function &F, Constant *ModuleID) {
@@ -47,7 +47,7 @@ namespace {
     {
       LLVMContext &VMContext = M.getContext();
       Int32Ty = IntegerType::get(VMContext, 32);
-      LLVMPointerType *PtrTy = Type::getInt8PtrTy(VMContext);
+      LLVMPointerTy *PtrTy = Type::getInt8PtrTy(VMContext);
       Constant *moduleName = 
 #if (LLVM_MAJOR > 3) || ((LLVM_MAJOR == 3) && (LLVM_MINOR > 0))
         ConstantDataArray::getString(VMContext, M.getModuleIdentifier(), true);