diff --git a/config/arch/msp430.in b/config/arch/msp430.in
new file mode 100644
index 00000000..a1c4ab58
--- /dev/null
+++ b/config/arch/msp430.in
@@ -0,0 +1,8 @@
+# MSP430 specific config options
+
+## select ARCH_SUPPORTS_16
+## select ARCH_DEFAULT_16
+## select ARCH_REQUIRES_MULTILIB
+##
+## help The 16-bit MSP430 architecture, as defined by:
+## help     http://www.ti.com/lsds/ti/microcontrollers-16-bit-32-bit/msp/overview.page?HQS=msp430
diff --git a/config/target.in b/config/target.in
index 7e4e837a..2ce8aa3f 100644
--- a/config/target.in
+++ b/config/target.in
@@ -132,6 +132,9 @@ config ARCH_ENDIAN
 config ARCH_SUPPORTS_8
     bool
 
+config ARCH_SUPPORTS_16
+    bool
+
 config ARCH_SUPPORTS_32
     bool
 
@@ -165,6 +168,11 @@ config ARCH_8
     prompt "8-bit"
     depends on ARCH_SUPPORTS_8
 
+config ARCH_16
+    bool
+    prompt "16-bit"
+    depends on ARCH_SUPPORTS_16
+
 config ARCH_32
     bool
     prompt "32-bit"
diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config
new file mode 100644
index 00000000..1f25ed8b
--- /dev/null
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -0,0 +1,2 @@
+CT_ARCH_msp430=y
+CT_DEBUG_gdb=y
diff --git a/samples/msp430-unknown-elf/reported.by b/samples/msp430-unknown-elf/reported.by
new file mode 100644
index 00000000..2518b772
--- /dev/null
+++ b/samples/msp430-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Andrew Wygle"
+reporter_url="https://github.com/awygle"
+reporter_comment="MSP430 16-bit toolchain"
diff --git a/scripts/build/arch/msp430.sh b/scripts/build/arch/msp430.sh
new file mode 100644
index 00000000..8edb72a7
--- /dev/null
+++ b/scripts/build/arch/msp430.sh
@@ -0,0 +1,5 @@
+# Compute MSP430-specific values
+
+CT_DoArchTupleValues() {
+    CT_TARGET_ARCH="${CT_ARCH}"
+}