diff --git a/configure b/configure
index cbda923c..b3f5da49 100755
--- a/configure
+++ b/configure
@@ -1451,8 +1451,8 @@ Optional Features:
   --enable-targets        Build specific host targets: all or
                           target1,target2,... Valid targets are: host, x86,
                           x86_64, sparc, powerpc, arm, aarch64, mips, hexagon,
-                          xcore, msp430, nvptx, systemz, r600, and cpp
-                          (default=all)
+                          xcore, msp430, nvptx, systemz, r600, wdc65816 and
+                          cpp (default=all)
   --enable-experimental-targets
                           Build experimental host targets: disable or
                           target1,target2,... (default=disable)
@@ -4058,6 +4058,7 @@ else
   hexagon-*)              llvm_cv_target_arch="Hexagon" ;;
   nvptx-*)                llvm_cv_target_arch="NVPTX" ;;
   s390x-*)                llvm_cv_target_arch="SystemZ" ;;
+  wdc65816-*)             llvm_cv_target_arch="WDC65816" ;;
   *)                      llvm_cv_target_arch="Unknown" ;;
 esac
 fi
@@ -5707,7 +5708,7 @@ if test "$enableval" = host-only ; then
   enableval=host
 fi
 case "$enableval" in
-  all) TARGETS_TO_BUILD="X86 Sparc PowerPC AArch64 ARM Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ R600" ;;
+  all) TARGETS_TO_BUILD="X86 Sparc PowerPC AArch64 ARM Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ R600 WDC65816" ;;
   *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
       case "$a_target" in
         x86)      TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -5727,6 +5728,7 @@ case "$enableval" in
         nvptx)    TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
         systemz)  TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;;
         r600)     TARGETS_TO_BUILD="R600 $TARGETS_TO_BUILD" ;;
+        wdc65816) TARGETS_TO_BUILD="WDC65816 $TARGETS_TO_BUILD" ;;
         host) case "$llvm_cv_target_arch" in
             x86)         TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
             x86_64)      TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt
index 98d26bca..388ebecd 100644
--- a/lib/Target/LLVMBuild.txt
+++ b/lib/Target/LLVMBuild.txt
@@ -16,7 +16,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = AArch64 ARM CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ X86 XCore
+subdirectories = AArch64 ARM CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ WDC65816 X86 XCore
 
 ; This is a special group whose required libraries are extended (by llvm-build)
 ; with the best execution engine (the native JIT, if available, or the
diff --git a/lib/Target/WDC65816/LLVMBuild.txt b/lib/Target/WDC65816/LLVMBuild.txt
new file mode 100644
index 00000000..5aa1fa1d
--- /dev/null
+++ b/lib/Target/WDC65816/LLVMBuild.txt
@@ -0,0 +1,34 @@
+;===- ./lib/Target/WDC65816/LLVMBuild.txt -------------------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[common]
+subdirectories =
+
+[component_0]
+type = TargetGroup
+name = WDC65816
+parent = Target
+has_asmprinter = 0
+has_jit = 0
+
+[component_1]
+type = Library
+name = WDC65816CodeGen
+parent = WDC65816
+required_libraries = AsmPrinter CodeGen Core MC SelectionDAG 
+                    Support Target
+add_to_library_groups = WDC65816
diff --git a/lib/Target/WDC65816/Makefile b/lib/Target/WDC65816/Makefile
new file mode 100644
index 00000000..dd82f02a
--- /dev/null
+++ b/lib/Target/WDC65816/Makefile
@@ -0,0 +1,20 @@
+##===- lib/Target/WDC65816/Makefile ----------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../..
+LIBRARYNAME = LLVMWDC65816CodeGen
+TARGET = WDC65816
+
+# Make sure that tblgen is run, first thing.
+BUILT_SOURCES =
+
+# DIRS = InstPrinter Disassembler AsmParser TargetInfo MCTargetDesc
+
+include $(LEVEL)/Makefile.common
+