diff --git a/tools/options.py b/tools/options.py
index f97339e2dc..ae3c14ed10 100644
--- a/tools/options.py
+++ b/tools/options.py
@@ -21,7 +21,7 @@ from os.path import join, dirname
 from os import listdir
 from argparse import ArgumentParser, ArgumentTypeError
 
-from .toolchains import TOOLCHAINS
+from .toolchains import TOOLCHAINS, EXTRA_TOOLCHAIN_NAMES
 from .targets import TARGET_NAMES, Target, update_target_data
 from .utils import (argparse_force_uppercase_type, argparse_deprecate,
                     argparse_lowercase_hyphen_type, argparse_many,
@@ -45,6 +45,7 @@ def get_default_options_parser(add_clean=True, add_options=True,
     targetnames = TARGET_NAMES
     targetnames.sort()
     toolchainlist = list(TOOLCHAINS)
+    toolchainlist.extend(EXTRA_TOOLCHAIN_NAMES)
     toolchainlist.sort()
 
     parser.add_argument("-m", "--mcu",
diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py
index aba8347548..b2a63dbedd 100755
--- a/tools/toolchains/__init__.py
+++ b/tools/toolchains/__init__.py
@@ -26,6 +26,10 @@ TOOLCHAIN_CLASSES = {
     u'IAR': iar.IAR
 }
 
+EXTRA_TOOLCHAIN_NAMES = [
+    u"ARMC5"
+]
+
 TOOLCHAINS = set(TOOLCHAIN_CLASSES.keys())
 
 # Top level re-exports