diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index b8b0d505c8bf..d14976fc0ee2 100644
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -2764,7 +2764,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = "Release+Asserts";
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
@@ -2817,7 +2817,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = "Release+Asserts";
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
@@ -2927,7 +2927,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(DERIVED_FILE_DIR)/llvm.build";
-				LLVM_CONFIGURATION = "Release+Asserts";
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl
index aaf7d8e951ce..1f260818829f 100644
--- a/lldb/scripts/build-llvm.pl
+++ b/lldb/scripts/build-llvm.pl
@@ -25,7 +25,7 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "'{2010-07-13T13:00}'";
+our $llvm_revision = "'{2010-07-20T16:00}'";
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2";
 our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2";
@@ -70,6 +70,7 @@ our @archive_files = (
 	"$llvm_configuration/lib/libLLVMLinker.a",
 	"$llvm_configuration/lib/libLLVMMC.a",
 	"$llvm_configuration/lib/libLLVMMCParser.a",
+	"$llvm_configuration/lib/libLLVMMCDisassembler.a",
 	"$llvm_configuration/lib/libLLVMScalarOpts.a",
 	"$llvm_configuration/lib/libLLVMSelectionDAG.a",
 	"$llvm_configuration/lib/libLLVMSupport.a",
@@ -200,6 +201,10 @@ sub build_llvm
 			if (!-e $llvm_dstroot_arch_archive)
 			{
 				$do_make = 1;
+			}
+			else
+			{
+				print "LLVM architecture archive for ${arch} is '$llvm_dstroot_arch_archive'\n";
 			}		
 		}
 		else
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
index 7116e5952331..181710c5ffe3 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
@@ -10,15 +10,12 @@
 #ifndef liblldb_DisassemblerLLVM_h_
 #define liblldb_DisassemblerLLVM_h_
 
+
+#include "llvm-c/EnhancedDisassembly.h"
+
 #include "lldb/Core/Disassembler.h"
 #include "lldb/Host/Mutex.h"
 
-struct EDDisassembler;
-typedef EDDisassembler *EDDisassemblerRef;
-
-struct EDInst;
-typedef EDInst *EDInstRef;
-
 class DisassemblerLLVM : public lldb_private::Disassembler
 {
 public: