diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt
index 5e0c84fcab5..7237ed87787 100644
--- a/lib/Target/X86/CMakeLists.txt
+++ b/lib/Target/X86/CMakeLists.txt
@@ -61,5 +61,6 @@ add_llvm_target(X86CodeGen ${sources})
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
 add_subdirectory(InstPrinter)
+add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
 add_subdirectory(Utils)
diff --git a/lib/Target/X86/TargetDesc/Makefile b/lib/Target/X86/MCTargetDesc/Makefile
similarity index 100%
rename from lib/Target/X86/TargetDesc/Makefile
rename to lib/Target/X86/MCTargetDesc/Makefile
diff --git a/lib/Target/X86/TargetDesc/X86TargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86TargetDesc.cpp
similarity index 100%
rename from lib/Target/X86/TargetDesc/X86TargetDesc.cpp
rename to lib/Target/X86/MCTargetDesc/X86TargetDesc.cpp
diff --git a/lib/Target/X86/TargetDesc/X86TargetDesc.h b/lib/Target/X86/MCTargetDesc/X86TargetDesc.h
similarity index 100%
rename from lib/Target/X86/TargetDesc/X86TargetDesc.h
rename to lib/Target/X86/MCTargetDesc/X86TargetDesc.h
diff --git a/lib/Target/X86/Makefile b/lib/Target/X86/Makefile
index 9cd17eed6c5..2102db7f74b 100644
--- a/lib/Target/X86/Makefile
+++ b/lib/Target/X86/Makefile
@@ -21,6 +21,6 @@ BUILT_SOURCES = X86GenRegisterNames.inc X86GenRegisterDesc.inc \
                 X86GenCallingConv.inc X86GenSubtarget.inc \
 		X86GenEDInfo.inc
 
-DIRS = InstPrinter AsmParser Disassembler TargetInfo TargetDesc Utils
+DIRS = InstPrinter AsmParser Disassembler TargetInfo MCTargetDesc Utils
 
 include $(LEVEL)/Makefile.common
diff --git a/lib/Target/X86/X86.h b/lib/Target/X86/X86.h
index ec78d489a63..896bf0a7dca 100644
--- a/lib/Target/X86/X86.h
+++ b/lib/Target/X86/X86.h
@@ -84,11 +84,9 @@ MCObjectWriter *createX86MachObjectWriter(raw_ostream &OS,
                                           uint32_t CPUType,
                                           uint32_t CPUSubtype);
 
-extern Target TheX86_32Target, TheX86_64Target;
-
 } // End llvm namespace
 
-#include "TargetDesc/X86TargetDesc.h"
+#include "MCTargetDesc/X86TargetDesc.h"
 
 // Defines symbolic names for the X86 instructions.
 //